aboutsummaryrefslogtreecommitdiff
path: root/smelt
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2015-08-17 22:40:33 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2015-08-17 22:40:33 +0800
commit03a307b58ddc6244d3fad8d77d7f0bac0a24e05d (patch)
treec578005d3c66ccc53ed454e63403c30f72230924 /smelt
parentbfe4f5ac512493bd9a359a06875288fbfaea6ff8 (diff)
downloadbullet-lab-remix-03a307b58ddc6244d3fad8d77d7f0bac0a24e05d.tar.xz
Fix crashes in smAnmFile.
Do not crash if a non-exist file is requested in a DTP file. Fix several stupid typos. Fix missing smEntity3D constructor. Fix line spacing in smTTFont.
Diffstat (limited to 'smelt')
-rw-r--r--smelt/sdl/smelt_internal.hpp8
-rw-r--r--smelt/sdl/sys_sdl.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/smelt/sdl/smelt_internal.hpp b/smelt/sdl/smelt_internal.hpp
index 8b36ebf..73960a7 100644
--- a/smelt/sdl/smelt_internal.hpp
+++ b/smelt/sdl/smelt_internal.hpp
@@ -91,10 +91,10 @@ public:
virtual bool smInit();
virtual void smFinale();
virtual void smMainLoop();
- virtual void smUpdateFunc(SMHook func);
- virtual void smUnFocFunc(SMHook func);
- virtual void smFocFunc(SMHook func);
- virtual void smQuitFunc(SMHook func);
+ virtual void smUpdateFunc(smHook func);
+ virtual void smUnFocFunc(smHook func);
+ virtual void smFocFunc(smHook func);
+ virtual void smQuitFunc(smHook func);
virtual void smWinTitle(const char* title);
virtual bool smIsActive();
virtual void smNoSuspend(bool para);
diff --git a/smelt/sdl/sys_sdl.cpp b/smelt/sdl/sys_sdl.cpp
index 1892069..8ae3da1 100644
--- a/smelt/sdl/sys_sdl.cpp
+++ b/smelt/sdl/sys_sdl.cpp
@@ -178,10 +178,10 @@ void SMELT_IMPL::smMainLoop()
}
clearQueue();Active=false;
}
-void SMELT_IMPL::smUpdateFunc(SMHook func){pUpdateFunc=func;}
-void SMELT_IMPL::smUnFocFunc(SMHook func){pUnFocFunc=func;}
-void SMELT_IMPL::smFocFunc(SMHook func){pFocFunc=func;}
-void SMELT_IMPL::smQuitFunc(SMHook func){pQuitFunc=func;}
+void SMELT_IMPL::smUpdateFunc(smHook func){pUpdateFunc=func;}
+void SMELT_IMPL::smUnFocFunc(smHook func){pUnFocFunc=func;}
+void SMELT_IMPL::smFocFunc(smHook func){pFocFunc=func;}
+void SMELT_IMPL::smQuitFunc(smHook func){pQuitFunc=func;}
void SMELT_IMPL::smWinTitle(const char *title){strcpy(winTitle,title);}
bool SMELT_IMPL::smIsActive(){return Active;}
void SMELT_IMPL::smNoSuspend(bool para){noSuspend=para;}