mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-03 18:14:01 +00:00
Code Issues Releases Wiki Activity

Minor things. Most importantly: Game receives ACTION_SWIMLEFT and ACTION_SWIMLEFT now, for use in nodes' action() callback.

Browse source
This commit is contained in:
fgenesis 2013-08-26 20:57:38 +02:00
parent fefb30a7b3
commit c857722213
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Aquaria/DSQ.cpp
View file

@ -4572,6 +4572,7 @@ void DSQ::onUpdate(float dt)
os << " | s: " << dsq->continuity.seconds; os << " | s: " << dsq->continuity.seconds;
os << " | evQ: " << core->eventQueue.getSize(); os << " | evQ: " << core->eventQueue.getSize();
os << " | sndQ: " << core->dbg_numThreadDecoders; os << " | sndQ: " << core->dbg_numThreadDecoders;
os << " | dt: " << core->get_current_dt();
/* /*
os << " | s: " << dsq->continuity.seconds; os << " | s: " << dsq->continuity.seconds;
os << " cr: " << core->cullRadius; os << " cr: " << core->cullRadius;

2
Aquaria/Game.cpp
View file

@ -6853,10 +6853,8 @@ void Game::bindInput()
// used for scrolling help text // used for scrolling help text
dsq->user.control.actionSet.importAction(this, "SwimUp", ACTION_SWIMUP); dsq->user.control.actionSet.importAction(this, "SwimUp", ACTION_SWIMUP);
dsq->user.control.actionSet.importAction(this, "SwimDown", ACTION_SWIMDOWN); dsq->user.control.actionSet.importAction(this, "SwimDown", ACTION_SWIMDOWN);
/*
dsq->user.control.actionSet.importAction(this, "SwimLeft", ACTION_SWIMLEFT); dsq->user.control.actionSet.importAction(this, "SwimLeft", ACTION_SWIMLEFT);
dsq->user.control.actionSet.importAction(this, "SwimRight", ACTION_SWIMRIGHT); dsq->user.control.actionSet.importAction(this, "SwimRight", ACTION_SWIMRIGHT);
*/
dsq->user.control.actionSet.importAction(this, "PrevPage", ACTION_PREVPAGE); dsq->user.control.actionSet.importAction(this, "PrevPage", ACTION_PREVPAGE);

6
BBGE/Base.cpp
View file

@ -250,11 +250,11 @@ void stringToLowerUserData(std::string &s)
#ifndef HAVE_STRCASECMP #ifndef HAVE_STRCASECMP
int nocasecmp(const std::string &s1, const std::string &s2) int nocasecmp(const std::string &s1, const std::string &s2)
{ {
std::string::const_iterator it1=s1.begin(); const char *it1 = s1.c_str();
std::string::const_iterator it2=s2.begin(); const char *it2 = s2.c_str();
//stop when either string's end has been reached //stop when either string's end has been reached
while ( (it1!=s1.end()) && (it2!=s2.end()) ) while ( *it1 && *it2 )
{ {
if(charToUpper(*it1) != charToUpper(*it2)) //letters differ? if(charToUpper(*it1) != charToUpper(*it2)) //letters differ?
// return -1 to indicate smaller than, 1 otherwise // return -1 to indicate smaller than, 1 otherwise

2
BBGE/Base.h
View file

@ -26,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define WIN32_NOMINMAX #define WIN32_NOMINMAX
#include <windows.h> #include <windows.h>
#undef min
#undef max
#ifdef _MSC_VER #ifdef _MSC_VER
#define strtof (float)strtod #define strtof (float)strtod