projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- removed st_abort() from lisp reader, client code should check the return value...
[supertux.git]
/
src
/
gameloop.cpp
diff --git
a/src/gameloop.cpp
b/src/gameloop.cpp
index
45da68b
..
d523bda
100644
(file)
--- a/
src/gameloop.cpp
+++ b/
src/gameloop.cpp
@@
-157,7
+157,7
@@
GameSession::levelintro(void)
white_text->drawf(str, 0, 224, A_HMIDDLE, A_TOP, 1);
sprintf(str, "by %s", world->get_level()->author.c_str());
white_text->drawf(str, 0, 224, A_HMIDDLE, A_TOP, 1);
sprintf(str, "by %s", world->get_level()->author.c_str());
- white_small_text->drawf(str, 0,
40
0, A_HMIDDLE, A_TOP, 1);
+ white_small_text->drawf(str, 0,
36
0, A_HMIDDLE, A_TOP, 1);
flipscreen();
flipscreen();
@@
-527,8
+527,8
@@
GameSession::run()
update_time = last_update_time = st_get_ticks();
/* Clear screen: */
update_time = last_update_time = st_get_ticks();
/* Clear screen: */
- clearscreen(0, 0, 0);
- updatescreen();
+
//
clearscreen(0, 0, 0);
+
//
updatescreen();
// Eat unneeded events
SDL_Event event;
// Eat unneeded events
SDL_Event event;
@@
-750,9
+750,12
@@
std::string slotinfo(int slot)
sprintf(slotfile,"%s/slot%d.stsg",st_save_dir,slot);
lisp_object_t* savegame = lisp_read_from_file(slotfile);
sprintf(slotfile,"%s/slot%d.stsg",st_save_dir,slot);
lisp_object_t* savegame = lisp_read_from_file(slotfile);
- LispReader reader(lisp_cdr(savegame));
- reader.read_string("title", &title);
- lisp_free(savegame);
+ if (savegame)
+ {
+ LispReader reader(lisp_cdr(savegame));
+ reader.read_string("title", &title);
+ lisp_free(savegame);
+ }
if (access(slotfile, F_OK) == 0)
{
if (access(slotfile, F_OK) == 0)
{