r137 - in trunk: . src

[DONOTREPLY at icculus.org]

Author: jonas
Date: 2005-09-02 18:11:39 -0400 (Fri, 02 Sep 2005)
New Revision: 137

Modified:
   trunk/TODO
   trunk/src/editor.cpp
Log:
updated bugs, 10l

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2005-09-01 18:58:24 UTC (rev 136)
+++ trunk/TODO	2005-09-02 22:11:39 UTC (rev 137)
@@ -2,6 +2,8 @@
 ====
  o rewrite zombie (bug in movement!, attacks too often, use events, etc...)
  o memleaks, segfaults?
+ o left/right move + switchPlayer (keeps moving)
+ o key vs. trigger in map2
 
 
 Code

Modified: trunk/src/editor.cpp
===================================================================
--- trunk/src/editor.cpp	2005-09-01 18:58:24 UTC (rev 136)
+++ trunk/src/editor.cpp	2005-09-02 22:11:39 UTC (rev 137)
@@ -322,7 +322,7 @@
             editor->setBox(new ObjectBox(entries[curentry],"viking.bmp",area.x,area.y,"Name: ",next_name));
         } else if (entries[curentry]=="Plant") {
             editor->place_obj_name=&editor->place_arg2;
-            editor->setBox(new ObjectBox(entries[curentry],"viking.bmp",area.x,area.y,"Recovery time (in ms): ","0","Name: ",next_name));
+            editor->setBox(new ObjectBox(entries[curentry],"viking1.bmp",area.x,area.y,"Recovery time (in ms): ","0","Name: ",next_name));
         } else if (entries[curentry]=="Zombie") {
             editor->place_obj_name=&editor->place_arg1;
             editor->setBox(new ObjectBox(entries[curentry],"viking.bmp",area.x,area.y,"Name: ",next_name));