Merge scripting
authorHarley Laue <losinggeneration@gmail.com>
Mon, 22 Aug 2011 16:38:42 -0500
branchscripting
changeset 162 91a8494db13a
parent 161 89f11a855a6a (current diff)
parent 154 5af05659e8c5 (diff)
child 163 81dc95909040
Merge
--- a/include/hge.h	Mon Aug 22 16:01:30 2011 -0500
+++ b/include/hge.h	Mon Aug 22 16:38:42 2011 -0500
@@ -308,7 +308,7 @@
 	virtual bool		CALL	System_Initiate() = 0;
 	virtual void		CALL	System_Shutdown() = 0;
 	virtual bool		CALL	System_Start() = 0;
-	virtual char*		CALL	System_GetErrorMessage() = 0;
+	virtual const char*	CALL	System_GetErrorMessage() = 0;
 	virtual	void		CALL	System_Log(const char *format, ...) = 0;
 	virtual bool		CALL	System_Launch(const char *url) = 0;
 	virtual void		CALL	System_Snapshot(const char *filename=0) = 0;
--- a/src/core/unix/hge_impl.h	Mon Aug 22 16:01:30 2011 -0500
+++ b/src/core/unix/hge_impl.h	Mon Aug 22 16:38:42 2011 -0500
@@ -125,7 +125,7 @@
 	virtual HWND		CALL	System_GetStateHwnd  (hgeHwndState  );
 	virtual int			CALL	System_GetStateInt   (hgeIntState   );
 	virtual const char*	CALL	System_GetStateString(hgeStringState);
-	virtual char*		CALL	System_GetErrorMessage();
+	virtual const char*	CALL	System_GetErrorMessage();
 	virtual	void		CALL	System_Log(const char *format, ...);
 	virtual bool		CALL	System_Launch(const char *url);
 	virtual void		CALL	System_Snapshot(const char *filename=0);
--- a/src/core/unix/system.cpp	Mon Aug 22 16:01:30 2011 -0500
+++ b/src/core/unix/system.cpp	Mon Aug 22 16:38:42 2011 -0500
@@ -588,7 +588,7 @@
 	return NULL;
 }
 
-char* CALL HGE_Impl::System_GetErrorMessage()
+const char* CALL HGE_Impl::System_GetErrorMessage()
 {
 	return szError;
 }
--- a/src/core/windows/hge_impl.h	Mon Aug 22 16:01:30 2011 -0500
+++ b/src/core/windows/hge_impl.h	Mon Aug 22 16:38:42 2011 -0500
@@ -93,7 +93,7 @@
 	virtual HWND		CALL	System_GetStateHwnd  (hgeHwndState  );
 	virtual int			CALL	System_GetStateInt   (hgeIntState   );
 	virtual const char*	CALL	System_GetStateString(hgeStringState);
-	virtual char*		CALL	System_GetErrorMessage();
+	virtual const char*	CALL	System_GetErrorMessage();
 	virtual	void		CALL	System_Log(const char *format, ...);
 	virtual bool		CALL	System_Launch(const char *url);
 	virtual void		CALL	System_Snapshot(const char *filename=0);
@@ -181,7 +181,7 @@
 	virtual hgeVertex*	CALL	Gfx_StartBatch(int prim_type, HTEXTURE tex, int blend, int *max_prim);
 	virtual void		CALL	Gfx_FinishBatch(int nprim);
 	virtual void		CALL	Gfx_SetClipping(int x=0, int y=0, int w=0, int h=0);
-	virtual void		CALL	Gfx_SetTransform(float x=0, float y=0, float dx=0, float dy=0, float rot=0, float hscale=0, float vscale=0); 
+	virtual void		CALL	Gfx_SetTransform(float x=0, float y=0, float dx=0, float dy=0, float rot=0, float hscale=0, float vscale=0);
 
 	virtual HTARGET		CALL	Target_Create(int width, int height, bool zbuffer);
 	virtual void		CALL	Target_Free(HTARGET target);
@@ -297,7 +297,7 @@
 	int					_format_id(D3DFORMAT fmt);
 	void				_SetBlendMode(int blend);
 	void				_SetProjectionMatrix(int width, int height);
-	
+
 
 	// Audio
 	HINSTANCE			hBass;
--- a/src/core/windows/system.cpp	Mon Aug 22 16:01:30 2011 -0500
+++ b/src/core/windows/system.cpp	Mon Aug 22 16:38:42 2011 -0500
@@ -589,7 +589,7 @@
 	return NULL;
 }
 
-char* CALL HGE_Impl::System_GetErrorMessage()
+const char* CALL HGE_Impl::System_GetErrorMessage()
 {
 	return szError;
 }