mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-13 20:03:58 +02:00
Code Issues Projects Releases Wiki Activity

Fixed build issues with clang

Browse Source
This commit is contained in:
mathusummut
2018-06-10 23:48:39 +02:00
parent 46dd197910
commit 73d28db062
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/main/program.cpp
View File

@@ -214,7 +214,7 @@ namespace Glest {
void void
Program::ShowMessageProgramState::mouseMove(int x, int y, Program::ShowMessageProgramState::mouseMove(int x, int y,
const MouseState & const MouseState *
mouseState) { mouseState) {
mouseX = x; mouseX = x;
mouseY = y; mouseY = y;

2
source/glest_game/main/program.h
View File

@@ -263,7 +263,7 @@ namespace Glest {
virtual void virtual void
mouseDownLeft(int x, int y); mouseDownLeft(int x, int y);
virtual void virtual void
mouseMove(int x, int y, const MouseState & mouseState); mouseMove(int x, int y, const MouseState * mouseState);
virtual void virtual void
keyPress(SDL_KeyboardEvent c); keyPress(SDL_KeyboardEvent c);
virtual void virtual void

2
source/glest_game/type_instances/unit.cpp
View File

@@ -2726,7 +2726,7 @@ namespace Glest {
// or when the unit is selected and right clicked to a position. // or when the unit is selected and right clicked to a position.
if (commandType == NULL) { if (commandType == NULL) {
CommandClass command = ccMove; //default command CommandClass command = ccMove; //default command
if (this->getType()->isOfClass(ucWarrior) && (targetUnit == nullptr || this->getTeam() != targetUnit->getTeam())) if (this->getType()->isOfClass(ucWarrior) && (targetUnit == NULL || this->getTeam() != targetUnit->getTeam()))
command = ccAttack; command = ccAttack;
commandType = type->getFirstCtOfClass(command); commandType = type->getFirstCtOfClass(command);