Attachment #83927 for bug #119425

Lines 37-43 Link Here

(-)wormux-0.7.orig/src/graphic/color.h (-1 / +1 lines)
37	Color();	37	Color();
38	Color(Uint8 r, Uint8 g, Uint8 b, Uint8 a);	38	Color(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
39		39
40	bool Color::operator==(const Color &color) const;	40	bool operator==(const Color &color) const;
41		41
42	void SetColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a);	42	void SetColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
43		43

Lines 52-58 Link Here

(-)wormux-0.7.orig/src/graphic/surface.h (-1 / +1 lines)
52	void SetAutoFree(bool newAutoFree);	52	void SetAutoFree(bool newAutoFree);
53		53
54	void SetSurface(SDL_Surface *newSurface, bool freePrevious = true);	54	void SetSurface(SDL_Surface *newSurface, bool freePrevious = true);
55	void Surface::NewSurface(const Point2i &size, Uint32 flags, bool useAlpha = true);	55	void NewSurface(const Point2i &size, Uint32 flags, bool useAlpha = true);
56		56
57	SDL_Surface *GetSurface();	57	SDL_Surface *GetSurface();
58		58

Lines 72-81 Link Here

(-)wormux-0.7.orig/src/game/game_loop.h (-4 / +4 lines)
72	private:	72	private:
73	GameLoop();	73	GameLoop();
74		74
75	void GameLoop::InitGameData_NetServer();	75	void InitGameData_NetServer();
76	void GameLoop::InitGameData_NetClient();	76	void InitGameData_NetClient();
77	void GameLoop::InitData_Local();	77	void InitData_Local();
78	void GameLoop::InitData();	78	void InitData();
79		79
80	void RefreshClock();	80	void RefreshClock();
81	void CallDraw();	81	void CallDraw();

Lines 69-75 Link Here

(-)wormux-0.7.orig/src/weapon/air_attack.h (-1 / +1 lines)
69	bool PeutLacherObus() const;	69	bool PeutLacherObus() const;
70	int LitCibleX() const;	70	int LitCibleX() const;
71	int GetDirection() const;	71	int GetDirection() const;
72	void Avion::SignalGhostState (bool was_dead);	72	void SignalGhostState (bool was_dead);
73	};	73	};
74		74
75	class AirAttack : public Weapon	75	class AirAttack : public Weapon

Lines 72-78 Link Here

(-)wormux-0.7.orig/src/weapon/cluster_bomb.h (-1 / +1 lines)
72	ClusterLauncher();	72	ClusterLauncher();
73		73
74	private:	74	private:
75	ClusterBombConfig& ClusterLauncher::cfg() ;	75	ClusterBombConfig& cfg() ;
76	};	76	};
77		77
78	#endif	78	#endif




  for (it = widgets.begin(); 
       it != widgets.end(); 
       ++it){
    assert(it != NULL);
    if( (*it)->Clic(mousePosition, button) )
      return true;
  }

       it != widgets.end(); 
       ++it ){

    assert(it != NULL);

    if( it == widgets.begin() )
      _y += border.y - margin;


  for( it = widgets.begin(); 
       it != widgets.end(); 
       ++it ){
    assert(it != NULL);   

    if( it == widgets.begin() )
      _x += border.x - margin;

Return to bug 119425

Lines 56-62 Link Here

(-)wormux-0.7.orig/src/gui/box.cpp (-4 lines)
56	for (it = widgets.begin();	56	for (it = widgets.begin();
57	it != widgets.end();	57	it != widgets.end();
58	++it){	58	++it){
59	assert(it != NULL);
60	if( (*it)->Clic(mousePosition, button) )	59	if( (*it)->Clic(mousePosition, button) )
61	return true;	60	return true;
62	}	61	}
Lines 106-113 Link Here
106	it != widgets.end();	105	it != widgets.end();
107	++it ){	106	++it ){
108		107
109	assert(it != NULL);
110
111	if( it == widgets.begin() )	108	if( it == widgets.begin() )
112	_y += border.y - margin;	109	_y += border.y - margin;
113		110
Lines 154-160 Link Here
154	for( it = widgets.begin();	151	for( it = widgets.begin();
155	it != widgets.end();	152	it != widgets.end();
156	++it ){	153	++it ){
157	assert(it != NULL);
158		154
159	if( it == widgets.begin() )	155	if( it == widgets.begin() )
160	_x += border.x - margin;	156	_x += border.x - margin;