matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove intro text when using ptsave: handler

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-02 14:27:08 +01:00
parent daeddd5519
commit 9f0f9c1acd
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.c
View File

@ -936,6 +936,7 @@ int main(int argc, char *argv[])
{ {
puts("Got ptsave:id"); puts("Got ptsave:id");
saveURIOpen = tempSaveID; saveURIOpen = tempSaveID;
it = 0;
} }
break; break;
} }
@ -1749,12 +1750,8 @@ int main(int argc, char *argv[])
sdl_zoom_trig = 1; sdl_zoom_trig = 1;
} }
} }
<<<<<<< HEAD
=======
if (sdl_rkey == 'z' && sdl_zoom_trig==1)//if ==2 then it was toggled with alt+z, don't turn off on keyup if (sdl_rkey == 'z' && sdl_zoom_trig==1)//if ==2 then it was toggled with alt+z, don't turn off on keyup
sdl_zoom_trig = 0; sdl_zoom_trig = 0;
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
>>>>>>> 230ab97... move some key stuff out of sdl_poll, zoom won't be triggered even when disabled by lua now
} }
#ifdef INTERNAL #ifdef INTERNAL
int counterthing; int counterthing;