From 96da33160101d0ea0c887025bbacd53a1011f573 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 8 Dec 2010 01:15:00 +0000 Subject: [PATCH] Improved pause flag, will now only pause, not unpause the game --- includes/defines.h | 2 +- src/main.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/includes/defines.h b/includes/defines.h index 98cf15d47..59559a043 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -8,7 +8,7 @@ #endif #define SAVE_VERSION 44 -#define MINOR_VERSION 5 +#define MINOR_VERSION 6 #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter. //#define BETA diff --git a/src/main.c b/src/main.c index 6bb9007a4..cffe5e0ff 100644 --- a/src/main.c +++ b/src/main.c @@ -429,7 +429,9 @@ int parse_save(void *save, int size, int replace, int x0, int y0) { if(ver>=44){ legacy_enable = c[3]&0x01; - sys_pause = (c[3]>>1)&0x01; + if(!sys_pause){ + sys_pause = (c[3]>>1)&0x01; + } } else { if(c[3]==1||c[3]==0){ legacy_enable = c[3]; @@ -1948,8 +1950,11 @@ int main(int argc, char *argv[]) memset(fire_g, 0, sizeof(fire_g)); memset(fire_b, 0, sizeof(fire_b)); } - if(x>=19 && x<=35 && svf_last && svf_open && !bq) - parse_save(svf_last, svf_lsize, 1, 0, 0); + if(x>=19 && x<=35 && svf_last && svf_open && !bq){ + //int tpval = sys_pause; + parse_save(svf_last, svf_lsize, 1, 0, 0); + //sys_pause = tpval; + } if(x>=(XRES+BARSIZE-(510-476)) && x<=(XRES+BARSIZE-(510-491)) && !bq) { if(b & SDL_BUTTON_LMASK)