aboutsummaryrefslogtreecommitdiff
path: root/global.h
diff options
context:
space:
mode:
authorGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-02-24 03:25:05 +0000
committerGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-02-24 03:25:05 +0000
commit172056e7598d3447c682a694d824041076f3255e (patch)
tree3ba150866d6bbcc337932e3fc59a3af9715d0d85 /global.h
parent8cb1a0f4fcf8e7ecd54134e8d6f431b613c69091 (diff)
downloadbullet-lab-remix-172056e7598d3447c682a694d824041076f3255e.tar.xz
M trunk/CHANGELOG.TXT
M trunk/background.h M trunk/effects.h M trunk/global.h M trunk/hge/CxImage/ximagif.cpp M trunk/hge/CxImage/ximaint.cpp M trunk/hge/CxImage/ximapng.cpp M trunk/hge/graphics.cpp M trunk/hge/input.cpp M trunk/hge/resource.cpp M trunk/hge/sound.cpp M trunk/hge/system.cpp M trunk/hgehelp/hgefont.cpp M trunk/levels.h M trunk/libcgh.h M trunk/libcghEx.cpp M trunk/menuitem.cpp M trunk/menuitem.h M trunk/menus.h M trunk/music.h M trunk/scorec.h M trunk/scoresystem.h M trunk/towernbullet.h
Diffstat (limited to 'global.h')
-rw-r--r--global.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/global.h b/global.h
index 2ba3178..5856889 100644
--- a/global.h
+++ b/global.h
@@ -238,10 +238,12 @@ struct Target//An annoying circle
if (isonshow)TargShowProc();if(isonhide)TargHideProc();
targspr->RenderEx(targpos.x+7,targpos.y+7,rot,0.8);
if (!DisableAllTower)
+ {
if (LOWFPS)
rot+=17*rotspd;
else
rot+=rotspd;
+ }
}
}ATarg,BTarg;
int bulcnt=0,towcnt=0,linecnt=0;
@@ -290,7 +292,7 @@ void Throw(char *Filename,char *Info)
fprintf(stderr,"%s: %s\n",Filename,Info);
hge->System_Log("%s: %s\n",Filename,Info);
}
-void Error(char EC[],bool hgecreated=false)
+void Error(const char *EC,bool hgecreated=false)
{
#ifndef WIN32
fprintf(stderr,"%s\n",EC);
@@ -320,7 +322,7 @@ void Error(char EC[],bool hgecreated=false)
#endif
exit(0);
}
-void ShowTip(char *tip)
+void ShowTip(const char *tip)
{
if (strcmp(tip,lasttip)!=0)
{
@@ -487,6 +489,7 @@ TextureRect GetTextureRect(int type,TColors color)
case orange:return TextureRect(72,0,24,24);
case grey:return TextureRect(96,0,24,24);
case circle:return TextureRect(24,24,24,24);
+ default:return TextureRect(0,0,0,0);
}
}
if (type==1)
@@ -501,6 +504,7 @@ TextureRect GetTextureRect(int type,TColors color)
case white:return TextureRect(136,24,44,44);
case dblue:return TextureRect(0,92,44,44);
case orange:return TextureRect(0,180,44,44);
+ default:return TextureRect(0,0,0,0);
}
}
return TextureRect(0,0,0,0);