FIXED object interaction code

ksterker · Aug 5, 2010 · 3b403c6 · 3b403c6
1 parent 978d76f
commit 3b403c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/event/date.cc b/src/event/date.cc
@@ -246,7 +246,7 @@ std::string date::format_time (const std::string & format, const u_int32 & time)
 				// minutes of gametime
 				case 'm':
 				{
-					snprintf (str, 15, "%i", minute (time));
+					snprintf (str, 15, "%02i", minute (time));
 					break;
 				}
 				// no valid format code

diff --git a/src/py-wrappers/adonthell/py_world.i b/src/py-wrappers/adonthell/py_world.i
@@ -49,6 +49,7 @@ using namespace world;
 %include "world/object.h"
 %include "world/coordinates.h"
 %include "world/moving.h"
+%include "world/action.h"
 %include "world/character.h"
 %include "world/chunk.h"
 %include "world/chunk_info.h"

diff --git a/src/world/area.cc b/src/world/area.cc
@@ -398,7 +398,7 @@ bool area::get_state (base::flat & file)
         while (entity_data.next (&value, &size, &id) != base::flat::T_UNKNOWN)
         {
             // load action associated to location, if any
-            if ("action" == id)
+            if (strcmp ("action", id) == 0)
             {
                 // get action id
                 actn_id = *((const char*) value);
@@ -437,7 +437,7 @@ bool area::get_state (base::flat & file)
         while (entity_data.next (&value, &size, &id) != base::flat::T_UNKNOWN)
         {
             // load action associated to location, if any
-            if ("action" == id)
+            if (strcmp ("action", id) == 0)
             {
                 // get action id
                 actn_id = *((const char*) value);