Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation with MSVC2015 and v3.17 #67

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix compilation with MSVC2015 and v3.17 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88d2d18
Fix compilation with MSVC2015
GeorgeRBR May 27, 2018
fd06a5b
Fix compilation with v3.17
GeorgeRBR May 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Classes/Enemies.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void Fodder::setTurnRate(float turn)
setRotation3D(Vec3(fabsf(turn)*0.15, turn, 0));
_turn = turn;
}
float Fodder::getTurnRate()
float Fodder::getTurnRate() const
{
return _turn;
}
Expand Down Expand Up @@ -576,4 +576,4 @@ void Boss::update(float dt, Node* player)
angleDeg = -CC_RADIANS_TO_DEGREES(angleRad)+90;
_Cannon2->setRotation(angleDeg-getRotation());

}
}
2 changes: 1 addition & 1 deletion proj.win32/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

USING_NS_CC;

int APIENTRY _tWinMain(HINSTANCE hInstance,
int WINAPI _tWinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPTSTR lpCmdLine,
int nCmdShow)
Expand Down
2 changes: 1 addition & 1 deletion proj.win32/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
#include <tchar.h>

// C RunTime Header Files
#include "CCStdC.h"
#include "platform/CCStdC.h"

#endif // __MAIN_H__