From c85772221384d7d89d4865b6b6030f23790bfa50 Mon Sep 17 00:00:00 2001 From: fgenesis Date: Mon, 26 Aug 2013 20:57:38 +0200 Subject: [PATCH] Minor things. Most importantly: Game receives ACTION_SWIMLEFT and ACTION_SWIMLEFT now, for use in nodes' action() callback. --- Aquaria/DSQ.cpp | 1 + Aquaria/Game.cpp | 2 -- BBGE/Base.cpp | 6 +++--- BBGE/Base.h | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Aquaria/DSQ.cpp b/Aquaria/DSQ.cpp index ca8b7ae..207aab8 100644 --- a/Aquaria/DSQ.cpp +++ b/Aquaria/DSQ.cpp @@ -4572,6 +4572,7 @@ void DSQ::onUpdate(float dt) os << " | s: " << dsq->continuity.seconds; os << " | evQ: " << core->eventQueue.getSize(); os << " | sndQ: " << core->dbg_numThreadDecoders; + os << " | dt: " << core->get_current_dt(); /* os << " | s: " << dsq->continuity.seconds; os << " cr: " << core->cullRadius; diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp index 066d599..00b18be 100644 --- a/Aquaria/Game.cpp +++ b/Aquaria/Game.cpp @@ -6853,10 +6853,8 @@ void Game::bindInput() // used for scrolling help text dsq->user.control.actionSet.importAction(this, "SwimUp", ACTION_SWIMUP); dsq->user.control.actionSet.importAction(this, "SwimDown", ACTION_SWIMDOWN); - /* dsq->user.control.actionSet.importAction(this, "SwimLeft", ACTION_SWIMLEFT); dsq->user.control.actionSet.importAction(this, "SwimRight", ACTION_SWIMRIGHT); - */ dsq->user.control.actionSet.importAction(this, "PrevPage", ACTION_PREVPAGE); diff --git a/BBGE/Base.cpp b/BBGE/Base.cpp index 52940b4..bd81618 100644 --- a/BBGE/Base.cpp +++ b/BBGE/Base.cpp @@ -250,11 +250,11 @@ void stringToLowerUserData(std::string &s) #ifndef HAVE_STRCASECMP int nocasecmp(const std::string &s1, const std::string &s2) { - std::string::const_iterator it1=s1.begin(); - std::string::const_iterator it2=s2.begin(); + const char *it1 = s1.c_str(); + const char *it2 = s2.c_str(); //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? // return -1 to indicate smaller than, 1 otherwise diff --git a/BBGE/Base.h b/BBGE/Base.h index edb6006..624414c 100644 --- a/BBGE/Base.h +++ b/BBGE/Base.h @@ -26,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define WIN32_LEAN_AND_MEAN #define WIN32_NOMINMAX #include + #undef min + #undef max #ifdef _MSC_VER #define strtof (float)strtod