projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
710ea4a
)
Fixed parse errors.
author
Bill Kendrick
<nbs@sonic.net>
Wed, 31 Dec 2003 06:07:43 +0000
(06:07 +0000)
committer
Bill Kendrick
<nbs@sonic.net>
Wed, 31 Dec 2003 06:07:43 +0000
(06:07 +0000)
SVN-Revision: 90
src/leveleditor.c
patch
|
blob
|
history
src/menu.c
patch
|
blob
|
history
diff --git
a/src/leveleditor.c
b/src/leveleditor.c
index
5c15090
..
ee6f73a
100644
(file)
--- a/
src/leveleditor.c
+++ b/
src/leveleditor.c
@@
-8,7
+8,7
@@
* *
***************************************************************************/
* *
***************************************************************************/
-/* December 28, 2003 - December
29
, 2003 */
+/* December 28, 2003 - December
30
, 2003 */
/* leveleditor.c - A built-in level editor for SuperTux
by Ricardo Cruz <rick2@aeiou.pt> */
/* leveleditor.c - A built-in level editor for SuperTux
by Ricardo Cruz <rick2@aeiou.pt> */
@@
-132,6
+132,7
@@
int leveleditor()
SDL_Event event;
SDLKey key;
SDLMod keymod;
SDL_Event event;
SDLKey key;
SDLMod keymod;
+ int last_time, now_time;
strcpy(level_subset,"default");
strcpy(level_subset,"default");
@@
-141,7
+142,6
@@
int leveleditor()
menumenu = MENU_LEVELEDITOR;
show_menu = YES;
menumenu = MENU_LEVELEDITOR;
show_menu = YES;
- int last_time, now_time;
frame = 0; /* support for frames in some tiles, like waves and bad guys */
loadshared();
frame = 0; /* support for frames in some tiles, like waves and bad guys */
loadshared();
diff --git
a/src/menu.c
b/src/menu.c
index
2ac0fe3
..
6d2042a
100644
(file)
--- a/
src/menu.c
+++ b/
src/menu.c
@@
-7,7
+7,7
@@
tobi.web@gmx.de
http://www.newbreedsoftware.com/supertux/
tobi.web@gmx.de
http://www.newbreedsoftware.com/supertux/
- December 20, 2003 - December
29
, 2003
+ December 20, 2003 - December
30
, 2003
*/
#ifdef LINUX
*/
#ifdef LINUX
@@
-255,8
+255,9
@@
int menu_game(void)
drawcenteredtext("Load Game", 256, letters_red, NO_UPDATE, 2);
if(menuaction == MN_HIT) /* Don't show the menu anymore, if this item got hit */
{
drawcenteredtext("Load Game", 256, letters_red, NO_UPDATE, 2);
if(menuaction == MN_HIT) /* Don't show the menu anymore, if this item got hit */
{
+ char *x = NULL; /* In C, you can do this... */
+
show_menu = 0;
show_menu = 0;
- char *x = NULL;
loadgame(x);
}
}
loadgame(x);
}
}