Attachment #51185 for bug #77809

View | Details | Raw Unified | Return to bug 77809
Collapse All | Expand All

Lines 25-34 Link Here

(-)Makefile (-4 lines)
25		25
26	.include <bsd.port.pre.mk>	26	.include <bsd.port.pre.mk>
27		27
28	.if ${OSVERSION} >= 500113
29	BROKEN= "Does not compile (bad C++ code)"
30	.endif
31
32	post-patch:	28	post-patch:
33	${REINPLACE_CMD} 's\|"SDL/SDL\|"SDL\|g ; s\|<SDL/SDL\|<SDL\|g; \	29	${REINPLACE_CMD} 's\|"SDL/SDL\|"SDL\|g ; s\|<SDL/SDL\|<SDL\|g; \
34	s\|SDL_LIBSS\|SDL_LIBS\|g; s\|datadir/games\|datadir\|;' \	30	s\|SDL_LIBSS\|SDL_LIBS\|g; s\|datadir/games\|datadir\|;' \

Added Link Here

(-)files/patch-eventmanager.cpp (+11 lines)
1	--- src/eventmanager.cpp.orig Sat Jan 1 14:52:51 2005
2	+++ src/eventmanager.cpp Sat Jan 1 14:52:55 2005
3	@@ -40,7 +40,7 @@
4	lista_streams->remove(lista_streams->indexOf(s));
5	}
6
7	-void EventManager::pumpEvents(bool wait=false){
8	+void EventManager::pumpEvents(bool wait){
9	SDL_Event event;
10	Index * stream;
11	bool got=false;




--- src/graphic.cpp.orig	Sat Jan  1 14:51:18 2005
+++ src/graphic.cpp	Sat Jan  1 14:52:31 2005
@@ -44,11 +44,11 @@
   if (pixels) free(pixels);
 }
 
-void Graphic::setAlpha(char value=OPAQUE){
+void Graphic::setAlpha(char value){
   SDL_SetAlpha(surface, SDL_SRCALPHA, value);
 }
 
-void Graphic::enableClipping(bool flag=true){
+void Graphic::enableClipping(bool flag){
 
   if (flag){
     SDL_Rect rect;
@@ -68,7 +68,7 @@
   clip_height=height;
 }
 
-void Graphic::flip(Axis a=HAxis){
+void Graphic::flip(Axis a){
   if (surface){
     if (SDL_MUSTLOCK(surface))
       if (SDL_LockSurface(surface)<0) return;




--- src/hash.cpp.orig	Sat Jan  1 14:48:35 2005
+++ src/hash.cpp	Sat Jan  1 14:50:49 2005
@@ -55,10 +55,12 @@
   return(sum % nbuckets);
 }
 
-Hash::Hash(int bs=256){
+typedef List *ListPtr;
+
+Hash::Hash(int bs){
  int i;
  nbuckets=bs;
- lbuckets=new (List *)[nbuckets];
+ lbuckets=new ListPtr[nbuckets];
 
  for (i=0;i<nbuckets;i++)
    lbuckets[i]=new List();
@@ -99,7 +101,7 @@
   return NotAdded;
 }
 
-Hash::Result Hash::remove(Str * str, bool del=false){
+Hash::Result Hash::remove(Str * str, bool del){
   if (str){
     Index * i;
     List * list=lbuckets[function(str)];
@@ -135,7 +137,7 @@
   return NULL;
 }
 
-void Hash::empty(bool del=true){
+void Hash::empty(bool del){
   int i;
   List * list;
   for (i=0;i<nbuckets;i++){

Added Link Here

(-)files/patch-image.cpp (+11 lines)
1	--- src/image.cpp.orig Sat Jan 1 14:47:18 2005
2	+++ src/image.cpp Sat Jan 1 14:47:24 2005
3	@@ -19,7 +19,7 @@
4	#include "SDL_image.h"
5	#include <stdio.h>
6
7	-Image::Image(Str * filename=NULL):Graphic(){
8	+Image::Image(Str * filename):Graphic(){
9	if (filename) load(filename);
10	}
11




--- src/list.cpp.orig	Sat Jan  1 14:45:36 2005
+++ src/list.cpp	Sat Jan  1 14:47:10 2005
@@ -125,7 +125,7 @@
   return (insert(indexOf(i), obj));
 }
 
-List::Result List::remove(Index * index, bool del=false){
+List::Result List::remove(Index * index, bool del){
   if (isEmpty()) return EmptyList;
   if (!index) return NullIndex;
 
@@ -155,7 +155,7 @@
   return Removed;
 }
 
-void List::empty(bool del=true){
+void List::empty(bool del){
   while (!isEmpty())
     remove(getFirst(), del);
 }




--- src/pipe.cpp.orig	Sat Jan  1 14:45:09 2005
+++ src/pipe.cpp	Sat Jan  1 14:45:19 2005
@@ -43,11 +43,11 @@
   return !(full_level>0) && !fixed;
 }
 
-void Pipe::setFixed(bool flag=true){
+void Pipe::setFixed(bool flag){
   fixed=flag;
 }
 
-void Pipe::setBonus(Bonus bonus=NormalBonus){
+void Pipe::setBonus(Bonus bonus){
   this->bonus=bonus;
 }
 




--- src/pointer.h.orig	Sat Jan  1 14:55:27 2005
+++ src/pointer.h	Sat Jan  1 14:56:09 2005
@@ -45,9 +45,9 @@
 
     inline void setRow(int row);
     inline void setColumn(int column);
-    inline void setRowColumn(int row, int column);
-    inline void setMoved(bool flag);
-    inline bool moved();
+    void setRowColumn(int row, int column);
+    void setMoved(bool flag);
+    bool moved();
 
     Str * image_name;
     Image * ima;

Added Link Here

(-)files/patch-pointer.cpp (+11 lines)
1	--- src/pointer.cpp.orig Sat Jan 1 14:44:34 2005
2	+++ src/pointer.cpp Sat Jan 1 14:44:44 2005
3	@@ -17,7 +17,7 @@
4
5	#include "pointer.h"
6
7	-Pointer::Pointer(int row=0, int column=0){
8	+Pointer::Pointer(int row, int column){
9	this->row=row;
10	this->column=column;
11	this->moved_flag=true;

Added Link Here

(-)files/patch-score.cpp (+11 lines)
1	--- src/score.cpp.orig Sat Jan 1 14:44:00 2005
2	+++ src/score.cpp Sat Jan 1 14:44:07 2005
3	@@ -18,7 +18,7 @@
4	#include "score.h"
5	#include <math.h>
6
7	-Score::Score(int value=0){
8	+Score::Score(int value){
9	this->value=value;
10	delta=0;
11	changed=true;




--- src/str.cpp.orig	Sat Jan  1 14:43:20 2005
+++ src/str.cpp	Sat Jan  1 14:43:25 2005
@@ -11,7 +11,7 @@
 
 const char Str::nul = '\0';
 
-Str::Str(const char * string=NULL){
+Str::Str(const char * string){
   s=NULL;
   set(string);
 }
@@ -25,7 +25,7 @@
   if (s) delete[] s;
 }
 
-void Str::set(const char * string=NULL){
+void Str::set(const char * string){
   if (s) delete[] s;
   if (string){
     s=new char[strlen(string)+1];
@@ -71,7 +71,7 @@
   return (strlen(s));
 }
 
-bool Str::isEqual(Str * str, bool case_sensitive = true){
+bool Str::isEqual(Str * str, bool case_sensitive){
   if (case_sensitive){
     return (!strcmp(s, str->s));
   }

Return to bug 77809

Added Link Here

(-)files/patch-graphic.cpp (+25 lines)
1	--- src/graphic.cpp.orig Sat Jan 1 14:51:18 2005
2	+++ src/graphic.cpp Sat Jan 1 14:52:31 2005
3	@@ -44,11 +44,11 @@
4	if (pixels) free(pixels);
5	}
6
7	-void Graphic::setAlpha(char value=OPAQUE){
8	+void Graphic::setAlpha(char value){
9	SDL_SetAlpha(surface, SDL_SRCALPHA, value);
10	}
11
12	-void Graphic::enableClipping(bool flag=true){
13	+void Graphic::enableClipping(bool flag){
14
15	if (flag){
16	SDL_Rect rect;
17	@@ -68,7 +68,7 @@
18	clip_height=height;
19	}
20
21	-void Graphic::flip(Axis a=HAxis){
22	+void Graphic::flip(Axis a){
23	if (surface){
24	if (SDL_MUSTLOCK(surface))
25	if (SDL_LockSurface(surface)<0) return;

Added Link Here

(-)files/patch-hash.cpp (+35 lines)
1	--- src/hash.cpp.orig Sat Jan 1 14:48:35 2005
2	+++ src/hash.cpp Sat Jan 1 14:50:49 2005
3	@@ -55,10 +55,12 @@
4	return(sum % nbuckets);
5	}
6
7	-Hash::Hash(int bs=256){
8	+typedef List *ListPtr;
9	+
10	+Hash::Hash(int bs){
11	int i;
12	nbuckets=bs;
13	- lbuckets=new (List *)[nbuckets];
14	+ lbuckets=new ListPtr[nbuckets];
15
16	for (i=0;i<nbuckets;i++)
17	lbuckets[i]=new List();
18	@@ -99,7 +101,7 @@
19	return NotAdded;
20	}
21
22	-Hash::Result Hash::remove(Str * str, bool del=false){
23	+Hash::Result Hash::remove(Str * str, bool del){
24	if (str){
25	Index * i;
26	List * list=lbuckets[function(str)];
27	@@ -135,7 +137,7 @@
28	return NULL;
29	}
30
31	-void Hash::empty(bool del=true){
32	+void Hash::empty(bool del){
33	int i;
34	List * list;
35	for (i=0;i<nbuckets;i++){

Added Link Here

(-)files/patch-list.cpp (+20 lines)
1	--- src/list.cpp.orig Sat Jan 1 14:45:36 2005
2	+++ src/list.cpp Sat Jan 1 14:47:10 2005
3	@@ -125,7 +125,7 @@
4	return (insert(indexOf(i), obj));
5	}
6
7	-List::Result List::remove(Index * index, bool del=false){
8	+List::Result List::remove(Index * index, bool del){
9	if (isEmpty()) return EmptyList;
10	if (!index) return NullIndex;
11
12	@@ -155,7 +155,7 @@
13	return Removed;
14	}
15
16	-void List::empty(bool del=true){
17	+void List::empty(bool del){
18	while (!isEmpty())
19	remove(getFirst(), del);
20	}

Added Link Here

(-)files/patch-pipe.cpp (+16 lines)
1	--- src/pipe.cpp.orig Sat Jan 1 14:45:09 2005
2	+++ src/pipe.cpp Sat Jan 1 14:45:19 2005
3	@@ -43,11 +43,11 @@
4	return !(full_level>0) && !fixed;
5	}
6
7	-void Pipe::setFixed(bool flag=true){
8	+void Pipe::setFixed(bool flag){
9	fixed=flag;
10	}
11
12	-void Pipe::setBonus(Bonus bonus=NormalBonus){
13	+void Pipe::setBonus(Bonus bonus){
14	this->bonus=bonus;
15	}
16

Added Link Here

(-)files/patch-player.h (+15 lines)
1	--- src/pointer.h.orig Sat Jan 1 14:55:27 2005
2	+++ src/pointer.h Sat Jan 1 14:56:09 2005
3	@@ -45,9 +45,9 @@
4
5	inline void setRow(int row);
6	inline void setColumn(int column);
7	- inline void setRowColumn(int row, int column);
8	- inline void setMoved(bool flag);
9	- inline bool moved();
10	+ void setRowColumn(int row, int column);
11	+ void setMoved(bool flag);
12	+ bool moved();
13
14	Str * image_name;
15	Image * ima;

Added Link Here

(-)files/patch-str.cpp (+29 lines)
1	--- src/str.cpp.orig Sat Jan 1 14:43:20 2005
2	+++ src/str.cpp Sat Jan 1 14:43:25 2005
3	@@ -11,7 +11,7 @@
4
5	const char Str::nul = '\0';
6
7	-Str::Str(const char * string=NULL){
8	+Str::Str(const char * string){
9	s=NULL;
10	set(string);
11	}
12	@@ -25,7 +25,7 @@
13	if (s) delete[] s;
14	}
15
16	-void Str::set(const char * string=NULL){
17	+void Str::set(const char * string){
18	if (s) delete[] s;
19	if (string){
20	s=new char[strlen(string)+1];
21	@@ -71,7 +71,7 @@
22	return (strlen(s));
23	}
24
25	-bool Str::isEqual(Str * str, bool case_sensitive = true){
26	+bool Str::isEqual(Str * str, bool case_sensitive){
27	if (case_sensitive){
28	return (!strcmp(s, str->s));
29	}