[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata groundpiece_data.cxx,1
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata groundpiece_data.cxx,1.12,1.13 |
Date: |
18 Feb 2003 22:03:41 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldobjsdata
In directory dark:/tmp/cvs-serv23530/worldobjsdata
Modified Files:
groundpiece_data.cxx
Log Message:
groundtype fix
Index: groundpiece_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- groundpiece_data.cxx 18 Feb 2003 17:04:13 -0000 1.12
+++ groundpiece_data.cxx 18 Feb 2003 22:03:39 -0000 1.13
@@ -42,16 +42,15 @@
reader.read_desc("surface", desc);
std::string gptype_string;
- if (XMLhelper::get_prop(cur, "type", gptype_string))
+ if (XMLhelper::get_prop(cur, "type", gptype_string) && gptype_string !=
"groundpiece")
{
- if (gptype_string != "groundpiece")
- gptype = Groundtype::string_to_type (gptype_string);
+ gptype = Groundtype::string_to_type (gptype_string);
}
else
{
std::string type;
- reader.read_string("type", type);
- gptype = Groundtype::string_to_type (type);
+ if (reader.read_string("type", type))
+ gptype = Groundtype::string_to_type (type);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata groundpiece_data.cxx,1.12,1.13,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs groundpiece_obj.cxx,1.10,1.11
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/gui cursor.cxx,NONE,1.1 cursor.hxx,NONE,1.1 display.cxx,NONE,1.1 display.hxx,NONE,1.1 display_graphic_context.cxx,NONE,1.1 display_graphic_context.hxx,NONE,1.1 game_delta.hxx,NONE,1.1 game_delta_recorder.hxx,NONE,1.1 graphic_context.hxx,NONE,1.1 gui_screen.cxx,NONE,1.1 gui_screen.hxx,NONE,1.1 input_debug_screen.cxx,NONE,1.1 input_debug_screen.hxx,NONE,1.1 screen.cxx,NONE,1.1 screen.hxx,NONE,1.1 screen_manager.cxx,NONE,1.1 screen_manager.hxx,NONE,1.1 screen_manager_impl.hxx,NONE,1.1 screen_ptr.cxx,NONE,1.1 screen_ptr.hxx,NONE,1.1screen_state.hxx,NONE,1.1
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs groundpiece_obj.cxx,1.10,1.11
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/gui cursor.cxx,NONE,1.1 cursor.hxx,NONE,1.1 display.cxx,NONE,1.1 display.hxx,NONE,1.1 display_graphic_context.cxx,NONE,1.1 display_graphic_context.hxx,NONE,1.1 game_delta.hxx,NONE,1.1 game_delta_recorder.hxx,NONE,1.1 graphic_context.hxx,NONE,1.1 gui_screen.cxx,NONE,1.1 gui_screen.hxx,NONE,1.1 input_debug_screen.cxx,NONE,1.1 input_debug_screen.hxx,NONE,1.1 screen.cxx,NONE,1.1 screen.hxx,NONE,1.1 screen_manager.cxx,NONE,1.1 screen_manager.hxx,NONE,1.1 screen_manager_impl.hxx,NONE,1.1 screen_ptr.cxx,NONE,1.1 screen_ptr.hxx,NONE,1.1screen_state.hxx,NONE,1.1
- Index(es):