rpms/openlierox/devel .cvsignore, 1.2, 1.3 openlierox-0.57-64bit.patch, 1.1, 1.2 openlierox.spec, 1.1, 1.2 sources, 1.2, 1.3

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Sat Apr 14 09:13:28 UTC 2007 

Author: jwrdegoede

Update of /cvs/extras/rpms/openlierox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5384

Modified Files:
	.cvsignore openlierox-0.57-64bit.patch openlierox.spec sources 
Log Message:
* Fri Apr 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.57-0.3.beta2
- New upstream release 0.57beta2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openlierox/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Mar 2007 12:49:46 -0000	1.2
+++ .cvsignore	14 Apr 2007 09:12:49 -0000	1.3
@@ -1 +1 @@
-OpenLieroX_0.57_beta1.src.tar.bz
+OpenLieroX_0.57_beta2.src.tar.bz2

openlierox-0.57-64bit.patch:

Index: openlierox-0.57-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/openlierox/devel/openlierox-0.57-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openlierox-0.57-64bit.patch	19 Mar 2007 10:48:32 -0000	1.1
+++ openlierox-0.57-64bit.patch	14 Apr 2007 09:12:49 -0000	1.2
@@ -1,596 +1,13 @@
-diff -ur openlierox-0.57.orig/include/CBox.h openlierox-0.57/include/CBox.h
---- openlierox-0.57.orig/include/CBox.h	2007-01-26 20:29:35.000000000 +0100
-+++ openlierox-0.57/include/CBox.h	2007-03-12 22:41:34.000000000 +0100
-@@ -67,7 +67,7 @@
- 	int		KeyDown(int c)							{ return BOX_NONE; }
- 	int		KeyUp(int c)							{ return BOX_NONE; }
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2)	{ return 0; }
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2)	{ return 0; }
- 
- 	int		CheckEvent(void);
- 
-diff -ur openlierox-0.57.orig/include/CBrowser.h openlierox-0.57/include/CBrowser.h
---- openlierox-0.57.orig/include/CBrowser.h	2006-11-10 09:28:24.000000000 +0100
-+++ openlierox-0.57/include/CBrowser.h	2007-03-13 15:30:27.000000000 +0100
-@@ -95,8 +95,8 @@
- 
- 
- 	// Reading
--	long		iPos;
--	long		iLength;
-+	int		iPos;
-+	int		iLength;
- 	char		*sData;
- 
- 
-@@ -117,7 +117,7 @@
- 	int		KeyDown(int c)						{ return BRW_NONE; }
- 	int		KeyUp(int c)						{ return BRW_NONE; }
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
- 
- 	void	Draw(SDL_Surface *bmpDest);
- 	void	LoadStyle(void) {}
-diff -ur openlierox-0.57.orig/include/CButton.h openlierox-0.57/include/CButton.h
---- openlierox-0.57.orig/include/CButton.h	2006-11-10 09:28:24.000000000 +0100
-+++ openlierox-0.57/include/CButton.h	2007-03-12 22:41:34.000000000 +0100
-@@ -78,7 +78,7 @@
- 	int		KeyDown(int c)						{ return BTN_NONE; }
- 	int		KeyUp(int c)						{ return BTN_NONE; }
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2)	{ return 0; }
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2)	{ return 0; }
- 
- 	// Draw the button
- 	void	Draw(SDL_Surface *bmpDest);
-diff -ur openlierox-0.57.orig/include/CCheckbox.h openlierox-0.57/include/CCheckbox.h
---- openlierox-0.57.orig/include/CCheckbox.h	2006-11-25 17:21:27.000000000 +0100
-+++ openlierox-0.57/include/CCheckbox.h	2007-03-12 22:41:34.000000000 +0100
-@@ -64,7 +64,7 @@
- 	
- 
- 	// Process a message sent
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2) {
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2) {
- 
- 				switch(iMsg) {
- 					case CKM_SETCHECK:
-diff -ur openlierox-0.57.orig/include/CCombobox.h openlierox-0.57/include/CCombobox.h
---- openlierox-0.57.orig/include/CCombobox.h	2007-01-25 22:27:39.000000000 +0100
-+++ openlierox-0.57/include/CCombobox.h	2007-03-12 22:41:34.000000000 +0100
-@@ -116,7 +116,7 @@
- 
- 	void	Sort(bool ascending);
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2);	
-+	DWORD	SendMessage(int iMsg, DWORD Param1, DWORD Param2);	
- 
-     void    clear(void);
- 	void	addItem(int index, char *sindex, char *name);
-diff -ur openlierox-0.57.orig/include/CGuiLayout.h openlierox-0.57/include/CGuiLayout.h
---- openlierox-0.57.orig/include/CGuiLayout.h	2006-11-07 17:33:54.000000000 +0100
-+++ openlierox-0.57/include/CGuiLayout.h	2007-03-12 22:41:34.000000000 +0100
-@@ -112,7 +112,7 @@
- 
- 
- 	// Messaging
--	int			SendMessage(int iControl, int iMsg, DWORD Param1, DWORD Param2);
-+	DWORD			SendMessage(int iControl, int iMsg, DWORD Param1, DWORD Param2);
- 
- 	// Variables
- 	int			getID(void)		{ return iID; }
-diff -ur openlierox-0.57.orig/include/CImage.h openlierox-0.57/include/CImage.h
---- openlierox-0.57.orig/include/CImage.h	2007-01-26 20:29:31.000000000 +0100
-+++ openlierox-0.57/include/CImage.h	2007-03-12 22:41:34.000000000 +0100
-@@ -65,7 +65,7 @@
- 	int		KeyDown(int c)							{ return IMG_NONE; }
- 	int		KeyUp(int c)							{ return IMG_NONE; }
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
- 
- 	void	Draw(SDL_Surface *bmpDest);
- 
-diff -ur openlierox-0.57.orig/include/CInputBox.h openlierox-0.57/include/CInputBox.h
---- openlierox-0.57.orig/include/CInputBox.h	2006-12-31 20:22:17.000000000 +0100
-+++ openlierox-0.57/include/CInputBox.h	2007-03-12 22:41:34.000000000 +0100
-@@ -72,7 +72,7 @@
- 
- 
- 	// Process a message sent
--	inline int		SendMessage(int iMsg, DWORD Param1, DWORD Param2) {
-+	inline DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2) {
- 
- 				switch(iMsg) {
- 					case INM_GETVALUE:
-diff -ur openlierox-0.57.orig/include/CLabel.h openlierox-0.57/include/CLabel.h
---- openlierox-0.57.orig/include/CLabel.h	2007-01-02 04:41:37.000000000 +0100
-+++ openlierox-0.57/include/CLabel.h	2007-03-12 22:41:34.000000000 +0100
-@@ -60,7 +60,7 @@
- 	int		KeyDown(int c)						{ return LBL_NONE; }
- 	int		KeyUp(int c)						{ return LBL_NONE; }
- 
--	int	SendMessage(int iMsg, DWORD Param1, DWORD Param2)	{ 
-+	DWORD	SendMessage(int iMsg, DWORD Param1, DWORD Param2)	{ 
- 							if(iMsg==LBM_SETTEXT) fix_strncpy(sText, (char *)Param1); return 0;
- 						}
- 
-diff -ur openlierox-0.57.orig/include/CLine.h openlierox-0.57/include/CLine.h
---- openlierox-0.57.orig/include/CLine.h	2006-11-10 09:28:24.000000000 +0100
-+++ openlierox-0.57/include/CLine.h	2007-03-12 22:41:34.000000000 +0100
-@@ -47,7 +47,7 @@
- 	int		KeyDown(int c)						{ return LIN_NONE; }
- 	int		KeyUp(int c)						{ return LIN_NONE; }
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2)	{ 
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2)	{ 
- 							return 0;
- 						}
- 
-diff -ur openlierox-0.57.orig/include/CListview.h openlierox-0.57/include/CListview.h
---- openlierox-0.57.orig/include/CListview.h	2007-01-26 20:28:21.000000000 +0100
-+++ openlierox-0.57/include/CListview.h	2007-03-12 22:41:34.000000000 +0100
-@@ -168,7 +168,7 @@
- 
- 	void	LoadStyle(void) {}
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
-+	DWORD	SendMessage(int iMsg, DWORD Param1, DWORD Param2);
- 
- 	void	ReadjustScrollbar(void);
- 
-diff -ur openlierox-0.57.orig/include/CMenu.h openlierox-0.57/include/CMenu.h
---- openlierox-0.57.orig/include/CMenu.h	2006-11-10 09:28:24.000000000 +0100
-+++ openlierox-0.57/include/CMenu.h	2007-03-12 22:41:34.000000000 +0100
-@@ -70,7 +70,7 @@
- 	int		KeyDown(int c)						{ return MNU_NONE; }
- 	int		KeyUp(int c)						{ return MNU_NONE; }
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
-     
- 	void	Draw(SDL_Surface *bmpDest);
- 
-diff -ur openlierox-0.57.orig/include/CScrollbar.h openlierox-0.57/include/CScrollbar.h
---- openlierox-0.57.orig/include/CScrollbar.h	2007-01-25 21:47:59.000000000 +0100
-+++ openlierox-0.57/include/CScrollbar.h	2007-03-12 22:41:34.000000000 +0100
-@@ -92,7 +92,7 @@
- 	int		getMax(void)					{ return iMax; }
- 	int		getGrabbed(void)				{ return iSliderGrabbed; }
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
- 
- 
- 
-diff -ur openlierox-0.57.orig/include/CSlider.h openlierox-0.57/include/CSlider.h
---- openlierox-0.57.orig/include/CSlider.h	2006-11-10 09:28:24.000000000 +0100
-+++ openlierox-0.57/include/CSlider.h	2007-03-12 22:41:34.000000000 +0100
-@@ -67,7 +67,7 @@
- 
- 	void	LoadStyle(void) {}
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
- 
- 	int		getValue(void)						{ return iValue; }
- 	void	setValue(int v)						{ iValue = v; }
-diff -ur openlierox-0.57.orig/include/CTextbox.h openlierox-0.57/include/CTextbox.h
---- openlierox-0.57.orig/include/CTextbox.h	2007-01-02 23:54:56.000000000 +0100
-+++ openlierox-0.57/include/CTextbox.h	2007-03-12 22:41:34.000000000 +0100
-@@ -113,7 +113,7 @@
- 
- 	void	LoadStyle(void) {}
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2);
- 
- 	void	Backspace(void);
- 	void	Delete(void);
-diff -ur openlierox-0.57.orig/include/CTitleButton.h openlierox-0.57/include/CTitleButton.h
---- openlierox-0.57.orig/include/CTitleButton.h	2007-01-26 20:29:14.000000000 +0100
-+++ openlierox-0.57/include/CTitleButton.h	2007-03-12 22:41:34.000000000 +0100
-@@ -58,7 +58,7 @@
- 	int		KeyDown(int c)						{ return TBT_NONE; }
- 	int		KeyUp(int c)						{ return TBT_NONE; }
- 
--	int		SendMessage(int iMsg, DWORD Param1, DWORD Param2)	{ return 0; }
-+	DWORD		SendMessage(int iMsg, DWORD Param1, DWORD Param2)	{ return 0; }
- 
- 	// Draw the title button
- 	void	Draw(SDL_Surface *bmpDest);
-diff -ur openlierox-0.57.orig/include/CWidget.h openlierox-0.57/include/CWidget.h
---- openlierox-0.57.orig/include/CWidget.h	2007-01-26 20:33:38.000000000 +0100
-+++ openlierox-0.57/include/CWidget.h	2007-03-12 22:41:34.000000000 +0100
-@@ -123,7 +123,7 @@
- 	virtual	void	LoadStyle(void) = 0;
- 	virtual	void	Draw(SDL_Surface *bmpDest) = 0;
- 
--	virtual int		SendMessage(int iMsg, DWORD Param1, DWORD Param2) = 0;
-+	virtual DWORD	SendMessage(int iMsg, DWORD Param1, DWORD Param2) = 0;
- };
- 
- 
-diff -ur openlierox-0.57.orig/include/types.h openlierox-0.57/include/types.h
---- openlierox-0.57.orig/include/types.h	2006-11-04 17:54:24.000000000 +0100
-+++ openlierox-0.57/include/types.h	2007-03-12 22:41:34.000000000 +0100
-@@ -22,7 +22,7 @@
- 
- #ifndef WIN32
- // WIN32 defines this in windows.h
--typedef int DWORD;
-+typedef intptr_t DWORD; /* used to store both ints and pointers */
- typedef uchar byte;
- #endif
- 
-diff -ur openlierox-0.57.orig/src/client/CBrowser.cpp openlierox-0.57/src/client/CBrowser.cpp
---- openlierox-0.57.orig/src/client/CBrowser.cpp	2007-01-26 21:18:09.000000000 +0100
-+++ openlierox-0.57/src/client/CBrowser.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -49,7 +49,7 @@
+--- OpenLieroX/include/CBrowser.h.64bit	2007-02-23 21:49:07.000000000 +0100
++++ OpenLieroX/include/CBrowser.h	2007-04-13 21:49:30.000000000 +0200
+@@ -96,8 +96,8 @@
  
- ///////////////////
- // This widget is send a message
--int CBrowser::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
-+DWORD CBrowser::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
- {
- 	switch(iMsg) {
  
-@@ -503,8 +503,8 @@
- 							break;
- 						}
- 					}
--					strncpy(buf,obj->strText+p,MIN(sizeof(buf)-1,(unsigned int)c-p));
--					buf[MIN(sizeof(buf)-1,(unsigned int)c-p)]='\0';
-+					strncpy(buf,obj->strText+p,MIN((unsigned int)sizeof(buf)-1,(unsigned int)c-p));
-+					buf[MIN((unsigned int)sizeof(buf)-1,(unsigned int)c-p)]='\0';
- 					p=c;
+ 	// Reading
+-	long		iPos;
+-	long		iLength;
++	int		iPos;
++	int		iLength;
+ 	char		*sData;
  
- 					w = fnt->GetWidth(buf);
-diff -ur openlierox-0.57.orig/src/client/CClient_Draw.cpp openlierox-0.57/src/client/CClient_Draw.cpp
---- openlierox-0.57.orig/src/client/CClient_Draw.cpp	2007-01-26 21:20:33.000000000 +0100
-+++ openlierox-0.57/src/client/CClient_Draw.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -187,7 +187,7 @@
- 		tLX->cOutlineFont.Draw(bmpDest, 4, 366, tLX->clNormalText, "Talk: %s",sChat_Text);
- 		if (iChat_CursorVisible)  {
- 			static char buf[256];
--			iChat_Pos = MIN((unsigned int)iChat_Pos,sizeof(buf)-1);
-+			iChat_Pos = MIN((unsigned int)iChat_Pos,(unsigned int)sizeof(buf)-1);
- 			strncpy(buf,sChat_Text,iChat_Pos);
- 			buf[iChat_Pos] = '\0';
- 			DrawVLine(bmpDest, 368, 378, 4+tLX->cFont.GetWidth("Talk: ")+tLX->cFont.GetWidth(buf), tLX->clNormalText);
-diff -ur openlierox-0.57.orig/src/client/CCombobox.cpp openlierox-0.57/src/client/CCombobox.cpp
---- openlierox-0.57.orig/src/client/CCombobox.cpp	2007-01-26 21:18:31.000000000 +0100
-+++ openlierox-0.57/src/client/CCombobox.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -484,7 +484,7 @@
- 
- ///////////////////
- // Process a message sent to this widget
--int CCombobox::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
-+DWORD CCombobox::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
- {
- 
- 	switch(iMsg) {
-@@ -526,7 +526,7 @@
- 
- 		// Get the current item
- 		case CBM_GETCURITEM:
--			return (int)tSelected;
-+			return (DWORD)tSelected;
- 
- 		// Set the current item
- 		case CBM_SETCURSEL:
-diff -ur openlierox-0.57.orig/src/client/CGuiLayout.cpp openlierox-0.57/src/client/CGuiLayout.cpp
---- openlierox-0.57.orig/src/client/CGuiLayout.cpp	2007-01-26 21:19:18.000000000 +0100
-+++ openlierox-0.57/src/client/CGuiLayout.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -868,7 +868,7 @@
- 
- ///////////////////
- // Send a message to a widget
--int CGuiLayout::SendMessage(int iControl, int iMsg, DWORD Param1, DWORD Param2)
-+DWORD CGuiLayout::SendMessage(int iControl, int iMsg, DWORD Param1, DWORD Param2)
- {
- 	CWidget *w = getWidget(iControl);
- 
-diff -ur openlierox-0.57.orig/src/client/CImage.cpp openlierox-0.57/src/client/CImage.cpp
---- openlierox-0.57.orig/src/client/CImage.cpp	2006-12-31 18:36:36.000000000 +0100
-+++ openlierox-0.57/src/client/CImage.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -63,7 +63,7 @@
- 
- /////////////////////
- // This widget is a sendmessage
--int CImage::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
-+DWORD CImage::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
- {
- 	return 0;
- }
-diff -ur openlierox-0.57.orig/src/client/CListview.cpp openlierox-0.57/src/client/CListview.cpp
---- openlierox-0.57.orig/src/client/CListview.cpp	2007-01-26 21:24:01.000000000 +0100
-+++ openlierox-0.57/src/client/CListview.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -1023,7 +1023,7 @@
- 
- ///////////////////
- // This widget is send a message
--int CListview::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
-+DWORD CListview::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
- {
- 	char *s = NULL;
- 
-@@ -1089,7 +1089,7 @@
-         // Return the current item
-         case LVM_GETCURITEM:
-             if(tSelected)
--                return (int)tSelected;
-+                return (DWORD)tSelected;
-             return 0;
- 
- 		// Set the old-style property
-diff -ur openlierox-0.57.orig/src/client/CMenu.cpp openlierox-0.57/src/client/CMenu.cpp
---- openlierox-0.57.orig/src/client/CMenu.cpp	2006-12-31 18:35:22.000000000 +0100
-+++ openlierox-0.57/src/client/CMenu.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -34,7 +34,7 @@
- 
- ///////////////////
- // Handle a menu message
--int CMenu::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
-+DWORD CMenu::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
- {
-     switch(iMsg) {
- 
-diff -ur openlierox-0.57.orig/src/client/CScrollbar.cpp openlierox-0.57/src/client/CScrollbar.cpp
---- openlierox-0.57.orig/src/client/CScrollbar.cpp	2007-01-25 22:27:40.000000000 +0100
-+++ openlierox-0.57/src/client/CScrollbar.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -274,7 +274,7 @@
- 
- ///////////////////
- // Process a sent message
--int CScrollbar::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
-+DWORD CScrollbar::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
- {
-     switch( iMsg ) {
- 
-diff -ur openlierox-0.57.orig/src/client/CSlider.cpp openlierox-0.57/src/client/CSlider.cpp
---- openlierox-0.57.orig/src/client/CSlider.cpp	2006-10-28 16:00:55.000000000 +0200
-+++ openlierox-0.57/src/client/CSlider.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -63,7 +63,7 @@
- 
- ///////////////////
- // This widget is send a message
--int CSlider::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
-+DWORD CSlider::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
- {
- 	switch(iMsg) {
- 
-diff -ur openlierox-0.57.orig/src/client/CTextbox.cpp openlierox-0.57/src/client/CTextbox.cpp
---- openlierox-0.57.orig/src/client/CTextbox.cpp	2007-01-25 22:27:40.000000000 +0100
-+++ openlierox-0.57/src/client/CTextbox.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -94,10 +94,10 @@
- 	// Determine the cursor position in pixels
- 	int x = 0;
- 	if(cursorpos)  {
--		strncpy(buf,text,MIN(sizeof(buf)-1,(unsigned int)cursorpos));
-+		strncpy(buf,text,MIN((unsigned int)sizeof(buf)-1,(unsigned int)cursorpos));
- 	}
- 
--	buf[MIN(sizeof(buf)-1,(unsigned int)cursorpos)] = '\0';
-+	buf[MIN((unsigned int)sizeof(buf)-1,(unsigned int)cursorpos)] = '\0';
- 	x = tLX->cFont.GetWidth(buf);
- 	
- 	// Draw selection
-@@ -110,8 +110,8 @@
- 			int length = -iSelLength;
- 			if (length > (int)fix_strnlen(text))
- 				length = cursorpos;
--			strncpy(buf,&text[cursorpos-length],MIN(sizeof(buf)-1,(unsigned int)length));
--			buf[MIN(sizeof(buf)-1,(unsigned int)length)] = '\0';
-+			strncpy(buf,&text[cursorpos-length],MIN((unsigned int)sizeof(buf)-1,(unsigned int)length));
-+			buf[MIN((unsigned int)sizeof(buf)-1,(unsigned int)length)] = '\0';
- 			
- 			// Update the SelStart
- 			iSelStart = iCurpos+iSelLength;
-@@ -121,15 +121,15 @@
- 			int length = iSelLength;
- 			if (length > (int)fix_strnlen(text))
- 				length = fix_strnlen(text);
--			strncpy(buf,&text[cursorpos],MIN(sizeof(buf)-1,(unsigned int)length));
--			buf[MIN(sizeof(buf)-1,(unsigned int)length)] = '\0';
-+			strncpy(buf,&text[cursorpos],MIN((unsigned int)sizeof(buf)-1,(unsigned int)length));
-+			buf[MIN((unsigned int)sizeof(buf)-1,(unsigned int)length)] = '\0';
- 			// Update the SelStart
- 			iSelStart = iCurpos;
- 		}
- 
- 		// Update the selected text
--		strncpy(sSelectedText,&sText[iSelStart],MIN(sizeof(sSelectedText),(unsigned int)abs(iSelLength)));
--		sSelectedText[MIN(sizeof(sSelectedText)-1,(unsigned int)abs(iSelLength))] = '\0';
-+		strncpy(sSelectedText,&sText[iSelStart],MIN((unsigned int)sizeof(sSelectedText),(unsigned int)abs(iSelLength)));
-+		sSelectedText[MIN((unsigned int)sizeof(sSelectedText)-1,(unsigned int)abs(iSelLength))] = '\0';
- 		
- 		// Cursor on the left side of the selection
- 		if (iSelLength > 0)  {
-@@ -591,7 +591,7 @@
- 
- ///////////////////
- // This widget is send a message
--int CTextbox::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
-+DWORD CTextbox::SendMessage(int iMsg, DWORD Param1, DWORD Param2)
- {
- 	char *p;
- 
-diff -ur openlierox-0.57.orig/src/common/CChannel.cpp openlierox-0.57/src/common/CChannel.cpp
---- openlierox-0.57.orig/src/common/CChannel.cpp	2006-12-01 02:58:32.000000000 +0100
-+++ openlierox-0.57/src/common/CChannel.cpp	2007-03-13 15:27:51.000000000 +0100
-@@ -51,7 +51,7 @@
- {
- 	CBytestream outpack;
- 	int SendReliable = false;
--	ulong r1,r2;	
-+	unsigned int r1,r2;	
  
- 	outpack.Clear();
- 
-@@ -120,8 +120,8 @@
- // Process channel (after receiving data)
- int CChannel::Process(CBytestream *bs)
- {
--	ulong Sequence, SequenceAck;
--	ulong ReliableAck, ReliableMessage;	
-+	unsigned int Sequence, SequenceAck;
-+	unsigned int ReliableAck, ReliableMessage;	
- 	int drop;
- 
- 	// Start from the beginning of the packet
-@@ -144,7 +144,7 @@
- 	// TODO: Get rate estimation
- 
- 	// Get rid of the old packets
--	if(Sequence <= (ulong)iIncomingSequence) {
-+	if(Sequence <= (unsigned int)iIncomingSequence) {
- 		//Con_Printf(CNC_WARNING,"Warning: Packet dropped");
- 		return false;
- 	}
-@@ -162,7 +162,7 @@
- 
- 
- 	// If the outgoing reliable message has been acknowledged, clear it for more reliable messages
--	if(ReliableAck == (ulong)iReliableSequence)
-+	if(ReliableAck == (unsigned int)iReliableSequence)
- 		Reliable.Clear();
- 
- 
-diff -ur openlierox-0.57.orig/src/common/CMap.cpp openlierox-0.57/src/common/CMap.cpp
---- openlierox-0.57.orig/src/common/CMap.cpp	2007-01-26 21:34:31.000000000 +0100
-+++ openlierox-0.57/src/common/CMap.cpp	2007-03-13 14:37:27.000000000 +0100
-@@ -1929,8 +1929,8 @@
- 		return false;
- 
- 	// Write out the images & pixeflags to memory, compress the data & save the compressed data
--	ulong size = (Width*Height * 3) * 2 + (Width*Height) + 1;
--	ulong destsize = size + (size / 8) + 12;
-+	unsigned int size = (Width*Height * 3) * 2 + (Width*Height) + 1;
-+	unsigned int destsize = size + (size / 8) + 12;
- 
- 	uchar *pSource = new uchar[size];
- 	uchar *pDest = new uchar[destsize];
-@@ -1976,17 +1976,19 @@
- 	}
- 
- 	// Compress it
--	if( compress( pDest, &destsize, pSource, size) != Z_OK ) {
-+	uLongf long_destsize = destsize;
-+	if( compress( pDest, &long_destsize, pSource, size) != Z_OK ) {
- 		printf("Failed compressing\n");
- 		fclose(fp);
- 		delete[] pSource;
- 		delete[] pDest;
- 		return false;
- 	}
-+	destsize = long_destsize;
- 
- 	// Write out the details & the data
--	fwrite(GetEndianSwapped(destsize), sizeof(ulong), 1, fp);
--	fwrite(GetEndianSwapped(size), sizeof(ulong), 1, fp);
-+	fwrite(GetEndianSwapped(destsize), sizeof(unsigned int), 1, fp);
-+	fwrite(GetEndianSwapped(size), sizeof(unsigned int), 1, fp);
- 	fwrite(pDest, sizeof(uchar), destsize, fp);
- 
- 	delete[] pSource;
-@@ -2002,13 +2002,13 @@
- int CMap::LoadImageFormat(FILE *fp)
- {
- 	// Load the details
--	ulong size, destsize;
-+	unsigned int size, destsize;
- 	int x,y,n,p;
- 	Uint8 r,g,b;
- 
--	fread(&size, sizeof(ulong), 1, fp);
-+	fread(&size, sizeof(unsigned int), 1, fp);
- 	EndianSwap(size);
--	fread(&destsize, sizeof(ulong), 1, fp);
-+	fread(&destsize, sizeof(unsigned int), 1, fp);
- 	EndianSwap(destsize);
- 
- 	// Allocate the memory
-@@ -2022,14 +2024,15 @@
- 
- 	fread(pSource, sizeof(uchar), size, fp);
- 
--	if( uncompress( pDest, &destsize, pSource, size ) != Z_OK ) {
-+	uLongf long_destsize = destsize;
-+	if( uncompress( pDest, &long_destsize, pSource, size ) != Z_OK ) {
- 		printf("Failed decompression\n");
- 		fclose(fp);
- 		delete[] pSource;
- 		delete[] pDest;
- 		return false;
- 	}
--
-+	destsize = long_destsize;
- 
- 	// Translate the data
- 
-@@ -2118,7 +2118,7 @@
- 
- 	// Validate the liero level
- 	fseek(fp,0,SEEK_END);
--	long length = ftell(fp);
-+	int length = ftell(fp);
- 
- 	if(length != 176400 && length != 176402) {
- 		if(length == 177178)
-diff -ur openlierox-0.57.orig/src/common/Console.cpp openlierox-0.57/src/common/Console.cpp
---- openlierox-0.57.orig/src/common/Console.cpp	2007-01-26 22:05:10.000000000 +0100
-+++ openlierox-0.57/src/common/Console.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -471,8 +471,8 @@
- 		}
- 		if(n==0 && Console->iBlinkState)  {
- 			static char buf2[256];
--			strncpy(buf2,Console->Line[n].strText,MIN(sizeof(buf2)-1,(unsigned int)Console->iCurpos));
--			buf2[MIN(sizeof(buf2)-1,(unsigned int)Console->iCurpos)] = '\0';
-+			strncpy(buf2,Console->Line[n].strText,MIN((unsigned int)sizeof(buf2)-1,(unsigned int)Console->iCurpos));
-+			buf2[MIN((unsigned int)sizeof(buf2)-1,(unsigned int)Console->iCurpos)] = '\0';
- 			DrawVLine(bmpDest,texty,texty+tLX->cFont.GetHeight(),17+tLX->cFont.GetWidth(buf2),0xffff);
- 		}
- 
-diff -ur openlierox-0.57.orig/src/server/CServer.cpp openlierox-0.57/src/server/CServer.cpp
---- openlierox-0.57.orig/src/server/CServer.cpp	2007-01-26 22:07:30.000000000 +0100
-+++ openlierox-0.57/src/server/CServer.cpp	2007-03-12 22:41:34.000000000 +0100
-@@ -819,9 +819,10 @@
- 			w->setKills(0);
- 			w->setLives(WRM_OUT);
- 			w->setUsed(false);
--			CWorm *remoteworm = cClient->getRemoteWorms()+w->getID();
--			if ((int)remoteworm == w->getID())
-+			CWorm *remoteworm = cClient->getRemoteWorms();
-+			if (remoteworm == NULL)
- 				return;
-+			remoteworm += w->getID();
- 			if (remoteworm->getType() == PRF_COMPUTER)  {
- 				remoteworm->AI_Shutdown();
- 				remoteworm->setType(PRF_HUMAN);
-@@ -936,9 +937,10 @@
- 			w->setKills(0);
- 			w->setLives(WRM_OUT);
- 			w->setUsed(false);
--			CWorm *remoteworm = cClient->getRemoteWorms()+w->getID();
--			if ((int)remoteworm == w->getID())
-+			CWorm *remoteworm = cClient->getRemoteWorms();
-+			if (remoteworm == NULL)
- 				return;
-+			remoteworm += w->getID();
- 			if (remoteworm->getType() == PRF_COMPUTER)  {
- 				remoteworm->AI_Shutdown();
- 				remoteworm->setType(PRF_HUMAN);
-@@ -1304,7 +1306,7 @@
- 			k++;
- 			j++;
- 		}
--		buf[MIN(sizeof(buf)-1,(unsigned int)k)] = '\0';
-+		buf[MIN((unsigned int)sizeof(buf)-1,(unsigned int)k)] = '\0';
- 		k = 0;
- 		ip_parts[i] = atoi(buf);
- 	}
---- openlierox-0.57/src/common/CMap.cpp~	2007-03-13 15:40:01.000000000 +0100
-+++ openlierox-0.57/src/common/CMap.cpp	2007-03-13 15:40:01.000000000 +0100


Index: openlierox.spec
===================================================================
RCS file: /cvs/extras/rpms/openlierox/devel/openlierox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openlierox.spec	19 Mar 2007 10:48:32 -0000	1.1
+++ openlierox.spec	14 Apr 2007 09:12:49 -0000	1.2
@@ -1,13 +1,13 @@
-%define prever beta1
+%define prever beta2
 
 Name:           openlierox
 Version:        0.57
-Release:        0.2.%{prever}%{?dist}
+Release:        0.3.%{prever}%{?dist}
 Summary:        Addictive realtime multiplayer 2D shoot-em-up
 Group:          Amusements/Games
 License:        LGPL
 URL:            http://openlierox.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/OpenLieroX_%{version}_%{prever}.src.tar.bz
+Source0:        http://downloads.sourceforge.net/%{name}/OpenLieroX_%{version}_%{prever}.src.tar.bz2
 Source1:        %{name}.desktop
 Source2:        README.fedora
 Patch0:         openlierox-0.57-64bit.patch
@@ -15,6 +15,8 @@
 BuildRequires:  SDL_mixer-devel SDL_image-devel gd-devel libxml2-devel
 BuildRequires:  hawknl-devel zlib-devel desktop-file-utils 
 Requires:       hicolor-icon-theme
+# for people who try to install this using upstream capitalization
+Provides:       OpenLieroX = %{version}-%{release}
 
 %description
 OpenLierox is an extremely addictive realtime multiplayer 2D shoot-em-up
@@ -23,7 +25,7 @@
 
 
 %prep
-%setup -q -c
+%setup -q -n OpenLieroX
 %patch0 -p1 -z .64bit
 sed -i 's|test_include_file nl.h|test_include_file hawknl/nl.h|g' compile.sh
 sed -i 's/\r//g' doc/original_lx_docs/*.*
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Fri Apr 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.57-0.3.beta2
+- New upstream release 0.57beta2
+
 * Thu Mar 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.57-0.2.beta1
 - Various specfile fixes from review (bz 232071)
 - Source instead of execute the bash scripts to avoid umask problems


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openlierox/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2007 12:49:46 -0000	1.2
+++ sources	14 Apr 2007 09:12:49 -0000	1.3
@@ -1 +1 @@
-0ffa89b0938b9ad2d2dcf7978f9c10f2  OpenLieroX_0.57_beta1.src.tar.bz
+6985e35d7d1cd7520ccba387c459f333  OpenLieroX_0.57_beta2.src.tar.bz2

More information about the scm-commits mailing list