diff options
author | 2014-02-24 03:25:05 +0000 | |
---|---|---|
committer | 2014-02-24 03:25:05 +0000 | |
commit | 172056e7598d3447c682a694d824041076f3255e (patch) | |
tree | 3ba150866d6bbcc337932e3fc59a3af9715d0d85 /libcghEx.cpp | |
parent | 8cb1a0f4fcf8e7ecd54134e8d6f431b613c69091 (diff) | |
download | bullet-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 'libcghEx.cpp')
-rw-r--r-- | libcghEx.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcghEx.cpp b/libcghEx.cpp index f959e19..7ae9aa5 100644 --- a/libcghEx.cpp +++ b/libcghEx.cpp @@ -4,7 +4,7 @@ #include "libcgh.h" #include <cmath> #include <cstring> -static const char* LIBCGH_SRC_FN="libcghEx.cpp"; +//static const char* LIBCGH_SRC_FN="libcghEx.cpp"; void CircleIndicator::Init(double _r,double _thk,BYTE _a,bool _gr,HTEXTURE _Texture,TextureRect _TR,DWORD _cc) { @@ -64,10 +64,10 @@ double LinearProgresser::GetDelta(){return val-a;} double LinearProgresser::GetElapsed(){return Elapsed;} bool HangUpText::Active(){return TFont&&!done;} -void HangUpText::Init(char *Font,char *_Text,double _tlim,double _alim,double _dlim,DWORD _color) +void HangUpText::Init(const char *Font,const char *_Text,double _tlim,double _alim,double _dlim,DWORD _color) { TFont=new hgeFont(Font); - memcpy(Text,_Text,sizeof(_Text)); + strcpy(Text,_Text); Limit=_tlim;alim=_alim;dlim=_dlim;TFont->SetColor(_color); Progresser.Init(0,dlim,Limit);Progalpha.Init(0,255,Limit/2); } |