From fcb0631539b7e3291e36c9b9bfb471057b33d7d4 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Fri, 29 Mar 2019 00:47:32 +0100 Subject: [PATCH] Fixed broken links --- BUILD.md | 26 +++++++++++++------------- CONTRIBUTING.md | 12 ++++++------ INSTALL.md | 4 ++-- WEBSITE_DESIGN.md | 11 ++--------- source/game/types/unit_type.cpp | 3 --- source/game/world/map.cpp | 3 ++- source/game/world/map.h | 2 +- source/shared_lib/include/util/util.h | 2 +- 8 files changed, 27 insertions(+), 36 deletions(-) diff --git a/BUILD.md b/BUILD.md index 9aba3f120..a6f8b7eda 100644 --- a/BUILD.md +++ b/BUILD.md @@ -1,22 +1,22 @@ # BUILD.md * **Getting the code:** - * [Set up the repositories locally](https://github.com/Glest/glest-source/blob/develop/BUILD.md#set-up-the-repositories-locally) - * [cloning](https://github.com/Glest/glest-source/blob/develop/BUILD.md#procedure-for-cloning) - * [Extra options for compiling](https://github.com/Glest/glest-source/blob/develop/BUILD.md#extra-options-for-compiling) + * [Set up the repositories locally](https://github.com/Glest/glest-source/blob/master/BUILD.md#set-up-the-repositories-locally) + * [cloning](https://github.com/Glest/glest-source/blob/master/BUILD.md#procedure-for-cloning) + * [Extra options for compiling](https://github.com/Glest/glest-source/blob/master/BUILD.md#extra-options-for-compiling) * **Dependencies** - * [Windows](https://github.com/Glest/glest-source/blob/develop/BUILD.md#windows) - * [Linux, Mac OS, *BSD](https://github.com/Glest/glest-source/blob/develop/BUILD.md#linux) - * [Arch Linux](https://github.com/Glest/glest-source/blob/develop/BUILD.md#arch-linux) - * [Mac OS](https://github.com/Glest/glest-source/blob/develop/BUILD.md#mac-os) - * [BSD](https://github.com/Glest/glest-source/blob/develop/BUILD.md#bsd) + * [Windows](https://github.com/Glest/glest-source/blob/master/BUILD.md#windows) + * [Linux, Mac OS, *BSD](https://github.com/Glest/glest-source/blob/master/BUILD.md#linux) + * [Arch Linux](https://github.com/Glest/glest-source/blob/master/BUILD.md#arch-linux) + * [Mac OS](https://github.com/Glest/glest-source/blob/master/BUILD.md#mac-os) + * [BSD](https://github.com/Glest/glest-source/blob/master/BUILD.md#bsd) -* [Installing](https://github.com/Glest/glest-source/blob/develop/BUILD.md#installing) +* [Installing](https://github.com/Glest/glest-source/blob/master/BUILD.md#installing) * **Compiling** - * [Windows](https://github.com/Glest/glest-source/blob/develop/BUILD.md#windows) - * [Linux, Mac OS, *BSD](https://github.com/Glest/glest-source/blob/develop/BUILD.md#windows-1) + * [Windows](https://github.com/Glest/glest-source/blob/master/BUILD.md#windows) + * [Linux, Mac OS, *BSD](https://github.com/Glest/glest-source/blob/master/BUILD.md#windows-1) ## Set up the repositories locally @@ -56,7 +56,7 @@ To view all available options, use `cmake .. -LH` while in the build directory. On Windows simply run `setup.bat` in `\mk\windows`. `setup.bat` also updates the game before rebuilding. Follow the -[instructions](https://github.com/Glest/glest-source/blob/develop/mk/windows/README.md) +[instructions](https://github.com/Glest/glest-source/blob/master/mk/windows/README.md) listed in the `Windows` directory for further information. ### Linux @@ -124,7 +124,7 @@ Now that you have the source code and the dependencies, you can either compile Glest and run it without installing, or you can set options to install it. If you plan to **install**, then you can **skip the sections below** and read -[INSTALL.md](https://github.com/Glest/glest-source/blob/develop/INSTALL.md) +[INSTALL.md](https://github.com/Glest/glest-source/blob/master/INSTALL.md) ## Compiling diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b0aa43f7e..d2199bff9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ Please remember to "star" this project. ## Website Design -Documentation for designing the websites is in [WEBSITE_DESIGN.md](https://github.com/Glest/glest-source/blob/develop/WEBSITE_DESIGN.md). +Documentation for designing the websites is in [WEBSITE_DESIGN.md](https://github.com/Glest/glest-source/blob/master/WEBSITE_DESIGN.md). ## Mods, tech trees, scenarios, tilesets, maps @@ -90,7 +90,7 @@ Problems arise when multiple patches are included in a single pull request: from being merged See the instructions in -[BUILD.md](https://github.com/Glest/glest-source/blob/develop/BUILD.md) +[BUILD.md](https://github.com/Glest/glest-source/blob/master/BUILD.md) for important information about how to clone your forks so you can easily contribute patches, graphics, or other content to the Glest repositories. @@ -114,12 +114,12 @@ your fork. 1. [Fork the repo](https://github.com/Glest/glest-source/fork) (if you haven't already done so) 2. Clone it to your computer -3. When you're ready to work on an issue, be sure you're on the **develop** branch. From there, +3. When you're ready to work on an issue, be sure you're on the **master** branch. From there, [create a separate branch](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches) (e.g. issue_32) 4. Make your changes. If you're unsure of some details while you're making edits, you can discuss them on the ticket. -5. Add yourself to the [AUTHORS.md](https://github.com/Glest/glest-source/blob/develop/AUTHORS.md) file +5. Add yourself to the [AUTHORS.md](https://github.com/Glest/glest-source/blob/master/AUTHORS.md) file 6. Commit your changes. [git-cola](https://git-cola.github.io/) is a nice GUI front-end for adding files and entering commit messages (git-cola is probably available from your OS repository). @@ -129,7 +129,7 @@ discuss them on the ticket. 7. Push the working branch (e.g. issue_32) to your remote fork and make your [pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) - * Do not merge it with the **develop** branch on your fork. That would result in multiple, or + * Do not merge it with the **master** branch on your fork. That would result in multiple, or unrelated patches being included in a single PR. 8. If any further changes need to be made, comments will be made on the pull request. @@ -143,4 +143,4 @@ repo with the remote upstream. GitHub has instructions for doing this: 1. [Configuring a remote for a fork](https://help.github.com/articles/configuring-a-remote-for-a-fork/) * For step 3 on that page, use https://github.com/Glest/glest-source for the URL. 2. [Syncing a Fork](https://help.github.com/articles/syncing-a-fork/) - * On that page, it shows how to merge the **develop** branch (steps 4 & 5 of **Syncing a Fork**). + * On that page, it shows how to merge the **master** branch (steps 4 & 5 of **Syncing a Fork**). diff --git a/INSTALL.md b/INSTALL.md index dfe0dc190..2063bef15 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -8,12 +8,12 @@ operating system. ## Windows * [Glest Windows Installer](https://github.com/Glest/windows-installer) -* [Build and Install from source code](https://github.com/Glest/glest-source/blob/develop/mk/windows/README.md) +* [Build and Install from source code](https://github.com/Glest/glest-source/blob/master/mk/windows/README.md) ## Linux, Mac OS, BSD Review the dependency information and instructions for [building from -source](https://github.com/Glest/glest-source/blob/develop/BUILD.md). +source](https://github.com/Glest/glest-source/blob/master/BUILD.md). From the top of the project source directory: diff --git a/WEBSITE_DESIGN.md b/WEBSITE_DESIGN.md index 004d86ee8..fb6f53b40 100644 --- a/WEBSITE_DESIGN.md +++ b/WEBSITE_DESIGN.md @@ -20,13 +20,6 @@ changes). Part of the template for the site is in the perl script, and another part is in [an ini file](https://github.com/Glest/glest.github.io/blob/master/convert_faction_xml2html/glestpack.ini). -## Primary documentation - -### Files in [docs](https://github.com/Glest/glest.github.io/tree/master/docs) - -See the [README in that folder](https://github.com/Glest/glest.github.io/blob/master/docs/README.md) -for an explanation of how to edit the html files in glest.github.io/docs. - ## Server list and player stats ### https://glest.dreamhosters.com/ @@ -35,8 +28,8 @@ The repo is at https://github.com/Glest/glest-masterserver and the instructions are in -[docs/README.txt](https://github.com/Glest/glest-masterserver/blob/develop/docs/README.md) +[docs/README.txt](https://github.com/Glest/glest-masterserver/blob/master/README.md) To help with testing you can also use this: - * [exported database](https://github.com/Glest/glest-masterserver/blob/develop/docs/mysql_glest_dreamhosters_com_exported_20180616.sql) in SQL format + * [exported database](https://github.com/glest/glest-masterserver/blob/master/snapshot/mysql_glest_dreamhosters_com_exported_20180616.sql) in SQL format diff --git a/source/game/types/unit_type.cpp b/source/game/types/unit_type.cpp index 20cd39cf0..e4dcdd710 100644 --- a/source/game/types/unit_type.cpp +++ b/source/game/types/unit_type.cpp @@ -1338,9 +1338,6 @@ namespace Game { bool UnitType::getCellMapCell(int x, int y, CardinalDir facing) const { assert(cellMap); - if (cellMap == NULL) { - throw game_runtime_error("cellMap == NULL"); - } //checkItemInVault(&(this->size),this->size); int tmp = 0; diff --git a/source/game/world/map.cpp b/source/game/world/map.cpp index 226a80632..3f2eab595 100644 --- a/source/game/world/map.cpp +++ b/source/game/world/map.cpp @@ -1352,7 +1352,8 @@ namespace Game { assert(isInside(currPos)); if (ut->hasCellMap() == false || ut->getCellMapCell(i, j, unit->getModelFacing())) { - if (getCell(currPos)->getUnit(field) != NULL && getCell(currPos)->getUnit(field) != unit) { + Unit* current = getCell(currPos)->getUnit(field); + if (current != NULL && current != unit) { //if unit tries to move into a cell where another unit resides cancel the move command if (unit->getCurrSkill() != NULL && unit->getCurrSkill()->getClass() == scMove) { diff --git a/source/game/world/map.h b/source/game/world/map.h index 396542262..15e5d75ff 100644 --- a/source/game/world/map.h +++ b/source/game/world/map.h @@ -69,7 +69,7 @@ namespace Game { private: Cell(Cell&); - void operator=(Cell&); + //void operator=(Cell&); public: Cell(); diff --git a/source/shared_lib/include/util/util.h b/source/shared_lib/include/util/util.h index 17fd760f8..3565cdc24 100644 --- a/source/shared_lib/include/util/util.h +++ b/source/shared_lib/include/util/util.h @@ -69,7 +69,7 @@ namespace Shared { flags |= flag; } static bool isFlagSet(GlobalStaticFlagTypes flag) { - return (flags & (unsigned int) flag) == (unsigned int) flag; + return (flags & flag) == flag; } protected: