shithub: rott

Download patch

ref: dfb5ad7d211e9fd015f305a503334fc5fb87b6f8
parent: dad65e8699dbf9d4edc0e2e957dc816775aef20d
author: levesqu8 <levesqu8@msu.edu>
date: Sun Nov 26 18:42:39 EST 2017 

fixed MUSIC_Stop seg fault


--- a/rott/rt_game.c
+++ b/rott/rt_game.c
@@ -468,11 +468,13 @@
             if (iGLOBAL_SCREENWIDTH == 640) {

                 if (iGLOBAL_SCREENHEIGHT == 400)

                 {

-                    shape =  ( pic_t * )W_CacheLumpName( "backtile", PU_CACHE, Cvt_pic_t, 1 );

-                    DrawTiledRegion( 0, iGLOBAL_SCREENHEIGHT - 16, iGLOBAL_SCREENWIDTH, 16, 0,16, shape );

+                    pic_t * shapeTile =  ( pic_t * )W_CacheLumpName( "backtile", PU_CACHE, Cvt_pic_t, 1 );

+                    DrawTiledRegion( 0, iGLOBAL_SCREENHEIGHT - 16, topBarCenterOffsetX, 16, 0,16, shapeTile );

                     shape = ( pic_t * ) W_CacheLumpName( "bottbar", PU_CACHE, Cvt_pic_t, 1 );

                     

                     GameMemToScreen( shape, topBarCenterOffsetX, iGLOBAL_SCREENHEIGHT - 16, bufferofsonly ); //using topBarCenterOffsetX since bottbar dims == statbar dims

+                    

+                    DrawTiledRegion( 0, iGLOBAL_SCREENHEIGHT - 16, (topBarCenterOffsetX >> 1) + (iGLOBAL_SCREENWIDTH>>1), 16, 0,16, shapeTile );

                     

                 }

                 else

--- a/rott/rt_ted.c
+++ b/rott/rt_ted.c
@@ -1198,10 +1198,21 @@
                                       PRECACHEBARY+PRECACHELED1Y,
                                       W_GetNumForName ("led1"));//led1 progressbar
                 } else if ( iGLOBAL_SCREENWIDTH == 640) {
-                    DrawNormalSprite (72+(Gs*(lastmem<<2)),446,W_GetNumForName ("led1"));//led1 progressbar
-                    DrawNormalSprite (72+(Gs*(lastmem<<2)),446+3,W_GetNumForName ("led1"));//led1 progressbar
-                    DrawNormalSprite (72+3+(Gs*(lastmem<<2)),446,W_GetNumForName ("led1"));//led1 progressbar
-                    DrawNormalSprite (72+3+(Gs*(lastmem<<2)),446+3,W_GetNumForName ("led1"));//led1 progressbar
+                    if (iGLOBAL_SCREENHEIGHT == 400)
+                    {
+                        DrawNormalSprite (72+(Gs*(lastmem<<2)),364,W_GetNumForName ("led1"));//led1 progressbar
+                        DrawNormalSprite (72+(Gs*(lastmem<<2)),364+3,W_GetNumForName ("led1"));//led1 progressbar
+                        DrawNormalSprite (72+3+(Gs*(lastmem<<2)),364,W_GetNumForName ("led1"));//led1 progressbar
+                        DrawNormalSprite (72+3+(Gs*(lastmem<<2)),364+3,W_GetNumForName ("led1"));//led1 progressbar                    
+                    }
+                    else
+                    {
+                        DrawNormalSprite (72+(Gs*(lastmem<<2)),446,W_GetNumForName ("led1"));//led1 progressbar
+                        DrawNormalSprite (72+(Gs*(lastmem<<2)),446+3,W_GetNumForName ("led1"));//led1 progressbar
+                        DrawNormalSprite (72+3+(Gs*(lastmem<<2)),446,W_GetNumForName ("led1"));//led1 progressbar
+                        DrawNormalSprite (72+3+(Gs*(lastmem<<2)),446+3,W_GetNumForName ("led1"));//led1 progressbar
+                    }
+                    
                 } else if ( iGLOBAL_SCREENWIDTH == 800) {
                     DrawNormalSprite (91+(Gs*(lastmem<<2)),559,W_GetNumForName ("led1"));//led1 progressbar
                     DrawNormalSprite (91+(Gs*(lastmem<<2)),559+3,W_GetNumForName ("led1"));//led1 progressbar
@@ -1221,10 +1232,20 @@
                                       PRECACHEBARY+PRECACHELED2Y,
                                       W_GetNumForName ("led2"));//led2 progressbar
                 } else if ( iGLOBAL_SCREENWIDTH == 640) {
-                    DrawNormalSprite (72+(Gs*(lastcache<<2)),458,W_GetNumForName ("led2"));//led2 progressbar
-                    DrawNormalSprite (72+(Gs*(lastcache<<2)),458+3,W_GetNumForName ("led2"));//led2 progressbar
-                    DrawNormalSprite (72+3+(Gs*(lastcache<<2)),458,W_GetNumForName ("led2"));//led2 progressbar
-                    DrawNormalSprite (72+3+(Gs*(lastcache<<2)),458+3,W_GetNumForName ("led2"));//led2 progressbar
+                    if (iGLOBAL_SCREENHEIGHT == 400)
+                    {
+                        DrawNormalSprite (72+(Gs*(lastcache<<2)),378,W_GetNumForName ("led2"));//led2 progressbar
+                        DrawNormalSprite (72+(Gs*(lastcache<<2)),378+3,W_GetNumForName ("led2"));//led2 progressbar
+                        DrawNormalSprite (72+3+(Gs*(lastcache<<2)),378,W_GetNumForName ("led2"));//led2 progressbar
+                        DrawNormalSprite (72+3+(Gs*(lastcache<<2)),378+3,W_GetNumForName ("led2"));//led2 progressbar
+                    }
+                    else
+                    {
+                        DrawNormalSprite (72+(Gs*(lastcache<<2)),458,W_GetNumForName ("led2"));//led2 progressbar
+                        DrawNormalSprite (72+(Gs*(lastcache<<2)),458+3,W_GetNumForName ("led2"));//led2 progressbar
+                        DrawNormalSprite (72+3+(Gs*(lastcache<<2)),458,W_GetNumForName ("led2"));//led2 progressbar
+                        DrawNormalSprite (72+3+(Gs*(lastcache<<2)),458+3,W_GetNumForName ("led2"));//led2 progressbar
+                    }
 
                 } else if ( iGLOBAL_SCREENWIDTH == 800) {
                     DrawNormalSprite (91+(Gs*(lastcache<<2)),573,W_GetNumForName ("led2"));//led2 progressbar