[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/gui button.hxx,1.4,1.5 component.hxx,
|
From: |
torangan |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/gui button.hxx,1.4,1.5 component.hxx,1.13,1.14 cursor.cxx,1.2,1.3 cursor.hxx,1.1,1.2 display.cxx,1.2,1.3 display.hxx,1.2,1.3display_graphic_context.cxx,1.4,1.5 display_graphic_context.hxx,1.3,1.4 game_delta.hxx,1.1,1.2 game_delta_recorder.hxx,1.1,1.2 graphic_context.hxx,1.3,1.4 gui_manager.cxx,1.20,1.21 gui_manager.hxx,1.13,1.14 gui_screen.cxx,1.1,1.2 gui_screen.hxx,1.1,1.2 input_debug_screen.cxx,1.1,1.2 input_debug_screen.hxx,1.1,1.2 root_gui_manager.cxx,1.8,1.9 root_gui_manager.hxx,1.5,1.6 screen.hxx,1.1,1.2 screen_manager.cxx,1.8,1.9 screen_manager.hxx,1.3,1.4 screen_manager_impl.hxx,1.1,1.2 screen_ptr.cxx,1.2,1.3 screen_ptr.hxx,1.1,1.2 surface_button.cxx,1.7,1.8 surface_button.hxx,1.7,1.8 |
|
Date: |
19 Apr 2003 10:23:21 -0000 |
Update of /var/lib/cvs/Games/Pingus/src/gui
In directory dark:/tmp/cvs-serv20737/gui
Modified Files:
button.hxx component.hxx cursor.cxx cursor.hxx display.cxx
display.hxx display_graphic_context.cxx
display_graphic_context.hxx game_delta.hxx
game_delta_recorder.hxx graphic_context.hxx gui_manager.cxx
gui_manager.hxx gui_screen.cxx gui_screen.hxx
input_debug_screen.cxx input_debug_screen.hxx
root_gui_manager.cxx root_gui_manager.hxx screen.hxx
screen_manager.cxx screen_manager.hxx screen_manager_impl.hxx
screen_ptr.cxx screen_ptr.hxx surface_button.cxx
surface_button.hxx
Log Message:
removed trailing whitespace
Index: button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/button.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- button.hxx 16 Aug 2002 13:03:36 -0000 1.4
+++ button.hxx 19 Apr 2003 10:23:18 -0000 1.5
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Index: component.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/component.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- component.hxx 27 Nov 2002 20:05:42 -0000 1.13
+++ component.hxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -24,7 +24,7 @@
class GraphicContext;
-namespace GUI
+namespace GUI
{
/** A component represents an area which recivies events in the GUI,
@@ -35,16 +35,16 @@
public:
Component () { }
-
+
virtual void draw (GraphicContext& gc) =0;
virtual void update (float delta) { UNUSED_ARG(delta);}
-
+
virtual bool is_at (int x, int y) { UNUSED_ARG(x); UNUSED_ARG(y); return
false; }
// Events
/** Gets issued once the primary button is pressed */
virtual void on_primary_button_press (int x, int y) { UNUSED_ARG(x);
UNUSED_ARG(y); }
-
+
/** Gets issued once the primary button is released */
virtual void on_primary_button_release (int x, int y) { UNUSED_ARG(x);
UNUSED_ARG(y); }
@@ -76,10 +76,10 @@
/** true if mouse is currently over, FIXME: these seem to be
unimplementable without renaming on_pointer_enter() and wrapp them */
bool pointer_over ();
-
+
private:
Component (const Component&);
- Component& operator= (const Component&);
+ Component& operator= (const Component&);
};
} // namespace GUI
Index: cursor.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/cursor.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cursor.cxx 15 Apr 2003 19:06:50 -0000 1.2
+++ cursor.cxx 19 Apr 2003 10:23:18 -0000 1.3
@@ -36,8 +36,8 @@
{
sprite.update (delta);
}
-
-void
+
+void
Cursor::on_event()
{
const Input::Pointer* pointer =
Input::Controller::get_current()->get_pointer();
Index: cursor.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/cursor.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cursor.hxx 19 Feb 2003 09:51:44 -0000 1.1
+++ cursor.hxx 19 Apr 2003 10:23:18 -0000 1.2
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -31,14 +31,14 @@
{
private:
Sprite sprite;
-
+
public:
Cursor (std::string ident, std::string datafile);
virtual ~Cursor ();
-
+
virtual void update (float delta);
virtual void on_event();
-
+
private:
Cursor (const Cursor&);
Cursor& operator= (const Cursor&);
Index: display.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/display.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- display.cxx 15 Apr 2003 19:06:50 -0000 1.2
+++ display.cxx 19 Apr 2003 10:23:18 -0000 1.3
@@ -38,7 +38,7 @@
Display::remove_flip_screen_hook(this);
else
Display::add_flip_screen_hook(this);
-
+
is_visible = !is_visible;
}
@@ -60,7 +60,7 @@
{
(*i)->on_event();
}
-
+
CL_Display::flip_display(sync);
//CL_Display::put_display (CL_Rect (320, 0, 800, 600));
}
Index: display.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/display.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- display.hxx 15 Apr 2003 19:06:50 -0000 1.2
+++ display.hxx 19 Apr 2003 10:23:18 -0000 1.3
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -38,7 +38,7 @@
/** Called sortly before a flip_display () */
virtual void on_event() = 0;
virtual void toggle_display();
-
+
private:
DisplayHook (const DisplayHook&);
DisplayHook& operator= (const DisplayHook&);
@@ -57,7 +57,7 @@
static void add_flip_screen_hook(DisplayHook*);
static void remove_flip_screen_hook(DisplayHook*);
-
+
private:
Display ();
Display (const Display&);
Index: display_graphic_context.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/display_graphic_context.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- display_graphic_context.cxx 18 Apr 2003 17:08:26 -0000 1.4
+++ display_graphic_context.cxx 19 Apr 2003 10:23:18 -0000 1.5
@@ -25,10 +25,10 @@
#include "../math.hxx"
#include "../sprite.hxx"
-DisplayGraphicContext::DisplayGraphicContext (int x1_, int y1_, int x2_, int
y2_,
+DisplayGraphicContext::DisplayGraphicContext (int x1_, int y1_, int x2_, int
y2_,
int /*x_offset*/, int
/*y_offset*/)
: x1(x1_), y1(y1_), x2(x2_), y2(y2_), offset(-(x2_ - x1_) / 2.0f, -(y2_ -
x1_) / 2.0f, 1.0f)
-{
+{
center = Vector ((x2 - x1)/2.0f + x1,
(y2 - y1)/2.0f + y1);
//std::cout << "View: " << x1 << ", " << y1 << ", " << x2 << ", " << y2 <<
std::endl;
@@ -74,7 +74,7 @@
//std::cout << "Zoom: " << offset.z << std::endl;
}
-void
+void
DisplayGraphicContext::zoom_to (const CL_Rect & arg_rect)
{
CL_Rect rect;
@@ -83,7 +83,7 @@
rect.x2 = Math::max (arg_rect.x1, arg_rect.x2);
rect.y1 = Math::min (arg_rect.y1, arg_rect.y2);
rect.y2 = Math::max (arg_rect.y1, arg_rect.y2);
-
+
Vector pos1 = screen_to_world (Vector(rect.x1, rect.y1));
Vector pos2 = screen_to_world (Vector(rect.x2, rect.y2));
@@ -98,7 +98,7 @@
float screen_relation = float(get_width ()) / float(get_height ());
float rect_reation = width / height;
-
+
if (rect_reation > screen_relation)
{
set_zoom (get_width () / (pos2.x - pos1.x));
@@ -109,7 +109,7 @@
}
}
-int
+int
DisplayGraphicContext::get_width ()
{
return x2 - x1;
@@ -121,7 +121,7 @@
return y2 - y1;
}
-void
+void
DisplayGraphicContext::move (const Vector & delta)
{
offset += delta;
@@ -139,13 +139,13 @@
return ((pos + offset) * offset.z) + center;
}
-float
+float
DisplayGraphicContext::get_x_offset ()
{
return offset.x;
}
-float
+float
DisplayGraphicContext::get_y_offset ()
{
return offset.y;
@@ -157,27 +157,27 @@
CL_Display::clear_display(r, g, b);
}
-void
+void
DisplayGraphicContext::draw (Sprite& sprite, const Vector& pos)
{
sprite.put_screen(pos + offset + center);
}
-void
+void
DisplayGraphicContext::draw (Sprite& sprite, const Vector& pos, int frame)
{
CL_Surface sur (sprite.get_surface ());
- draw (sur,
+ draw (sur,
w2s_x(pos.x + sprite.get_x_align ()),
- w2s_y(pos.y + sprite.get_y_align ()),
+ w2s_y(pos.y + sprite.get_y_align ()),
frame);
}
-void
+void
DisplayGraphicContext::draw (CL_Surface& sur, const Vector& pos)
{
if (offset.z == 1.0)
- {
+ {
sur.put_screen (w2s_x(pos.x), w2s_y(pos.y));
}
else
@@ -189,13 +189,13 @@
//CL_Display::draw_line (x1, y2, x2, y1, 1.0, 1.0, 0.0);
}
-void
+void
DisplayGraphicContext::draw (CL_Surface& sur, const Vector& pos, int frame)
{
draw (sur, int(pos.x), int(pos.y), frame);
}
-void
+void
DisplayGraphicContext::draw (CL_Surface& sur, int x_pos, int y_pos)
{
if (offset.z == 1.0)
@@ -209,7 +209,7 @@
}
}
-void
+void
DisplayGraphicContext::draw (CL_Surface& sur, int x_pos, int y_pos, int frame)
{
if (offset.z == 1.0)
@@ -224,24 +224,24 @@
}
}
-void
-DisplayGraphicContext::draw (CL_Surface& sur, int x_pos, int y_pos,
+void
+DisplayGraphicContext::draw (CL_Surface& sur, int x_pos, int y_pos,
float size_x, float size_y, int frame)
{
sur.put_screen (w2s_x(x_pos), w2s_y(y_pos),
- size_x * offset.z,
- size_y * offset.z, frame);
+ size_x * offset.z,
+ size_y * offset.z, frame);
}
-void
+void
DisplayGraphicContext::draw_line (const Vector& pos1, const Vector& pos2,
float r, float g, float b, float a)
{
draw_line(int(pos1.x), int(pos1.y), int(pos2.x), int(pos2.y), r, g, b, a);
}
-void
-DisplayGraphicContext::draw_line (int x1, int y1, int x2, int y2,
+void
+DisplayGraphicContext::draw_line (int x1, int y1, int x2, int y2,
float r, float g, float b, float a)
{
CL_Display::draw_line(w2s_x(x1), w2s_y(y1),
@@ -249,8 +249,8 @@
r, g, b, a);
}
-void
-DisplayGraphicContext::draw_fillrect (int x1, int y1, int x2, int y2,
+void
+DisplayGraphicContext::draw_fillrect (int x1, int y1, int x2, int y2,
float r, float g, float b, float a)
{
CL_Display::fill_rect(w2s_x(x1), w2s_y(y1),
@@ -258,8 +258,8 @@
r, g, b, a);
}
-void
-DisplayGraphicContext::draw_rect (int x1, int y1, int x2, int y2,
+void
+DisplayGraphicContext::draw_rect (int x1, int y1, int x2, int y2,
float r, float g, float b, float a)
{
CL_Display::draw_rect(w2s_x(x1), w2s_y(y1),
@@ -267,8 +267,8 @@
r, g, b, a);
}
-void
-DisplayGraphicContext::draw_pixel (int /*x_pos*/, int /*y_pos*/,
+void
+DisplayGraphicContext::draw_pixel (int /*x_pos*/, int /*y_pos*/,
float /*r*/, float /*g*/, float /*b*/, float /*a*/)
{
//CL_Display::put_pixel (x1 + get_x_offset (),
@@ -276,7 +276,7 @@
std::cout << "View::draw_pixel () not implemented" << std::endl;
}
-void
+void
DisplayGraphicContext::draw_circle (int x_pos, int y_pos, int radius,
float r, float g, float b, float a)
{
@@ -307,7 +307,7 @@
{
font->print_center(w2s_x(x_pos), w2s_y(y_pos), str.c_str ());
}
-
+
void
DisplayGraphicContext::print_right (FontHandle font, int x_pos, int y_pos,
const std::string& str)
{
Index: display_graphic_context.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/display_graphic_context.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- display_graphic_context.hxx 18 Apr 2003 17:08:26 -0000 1.3
+++ display_graphic_context.hxx 19 Apr 2003 10:23:18 -0000 1.4
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2002 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -52,15 +52,15 @@
return static_cast<int>((y + get_y_offset()) * offset.z + center.y);
}
- inline void add_change_rect(int x, int y, int width, int height)
+ inline void add_change_rect(int x, int y, int width, int height)
{
change_rects.push_back(CL_Rect(x, y, x + width, y + height));
}
public:
- DisplayGraphicContext (int x1, int y1, int x2, int y2,
+ DisplayGraphicContext (int x1, int y1, int x2, int y2,
int /*x_offset*/, int /*y_offset*/);
virtual ~DisplayGraphicContext ();
-
+
Vector get_offset ();
float get_x_offset ();
@@ -99,26 +99,26 @@
void draw (CL_Surface& sur, int x_pos, int y_pos, int frame);
/** Draw a scaled surface */
- void draw (CL_Surface& sur, int x_pos, int y_pos,
+ void draw (CL_Surface& sur, int x_pos, int y_pos,
float size_x, float size_y, int frame);
/** Draw a line */
void draw_line (const Vector& pos1, const Vector& pos2,
float r, float g, float b, float a = 1.0f);
/** Draw a line */
- void draw_line (int x1, int y1, int x2, int y2,
+ void draw_line (int x1, int y1, int x2, int y2,
float r, float g, float b, float a = 1.0f);
/** Draw a filled rectangle (FIXME: [x1,x2] or [x1,x2[ ?) */
- void draw_fillrect (int x1, int y1, int x2, int y2,
+ void draw_fillrect (int x1, int y1, int x2, int y2,
float r, float g, float b, float a = 1.0f);
/** Draw an unfilled rectangle (FIXME: [x1,x2] or [x1,x2[ ?) */
- void draw_rect (int x1, int y1, int x2, int y2,
+ void draw_rect (int x1, int y1, int x2, int y2,
float r, float g, float b, float a = 1.0f);
/** Draw a singel pixel */
- void draw_pixel (int x_pos, int y_pos,
+ void draw_pixel (int x_pos, int y_pos,
float r, float g, float b, float a = 1.0f);
/** Draw a circle */
@@ -126,9 +126,9 @@
float r, float g, float b, float a = 1.0f);
void print_left (FontHandle font, int x_pos, int y_pos, const std::string&
str);
-
+
void print_center (FontHandle font, int x_pos, int y_pos, const std::string&
str);
-
+
void print_right (FontHandle font, int x_pos, int y_pos, const std::string&
str);
private:
Index: game_delta.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/game_delta.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- game_delta.hxx 19 Feb 2003 09:51:44 -0000 1.1
+++ game_delta.hxx 19 Apr 2003 10:23:18 -0000 1.2
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -32,11 +32,11 @@
const float time_delta;
const unsigned int absolute_time;
-
+
/** Reference to the event list from the controller, we must not
delete the Event* */
- const Input::EventLst& events;
-
+ const Input::EventLst& events;
+
public:
/** Construct a GameDelta with both time and events */
GameDelta (float time_delta_arg,
@@ -55,7 +55,7 @@
/** Return the events */
const Input::EventLst& get_events () const { return events; }
-
+
private:
GameDelta (const GameDelta&);
GameDelta& operator= (const GameDelta&);
Index: game_delta_recorder.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/game_delta_recorder.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- game_delta_recorder.hxx 19 Feb 2003 09:51:44 -0000 1.1
+++ game_delta_recorder.hxx 19 Apr 2003 10:23:18 -0000 1.2
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -23,7 +23,7 @@
class GameDeltaRecorder
{
private:
-
+
public:
GameDeltaRecorder ();
GameDelta* get ();
Index: graphic_context.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/graphic_context.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- graphic_context.hxx 21 Mar 2003 22:08:06 -0000 1.3
+++ graphic_context.hxx 19 Apr 2003 10:23:18 -0000 1.4
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2002 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -74,26 +74,26 @@
virtual void draw (CL_Surface& sur, int x_pos, int y_pos, int frame) =0;
/** Draw a scaled surface */
- virtual void draw (CL_Surface& sur, int x_pos, int y_pos,
+ virtual void draw (CL_Surface& sur, int x_pos, int y_pos,
float size_x, float size_y, int frame) =0;
/** Draw a line */
virtual void draw_line (const Vector& pos1, const Vector& pos2,
float r, float g, float b, float a = 1.0f) =0;
/** Draw a line */
- virtual void draw_line (int x1, int y1, int x2, int y2,
+ virtual void draw_line (int x1, int y1, int x2, int y2,
float r, float g, float b, float a = 1.0f) =0;
/** Draw a filled rectangle (FIXME: [x1,x2] or [x1,x2[ ?) */
- virtual void draw_fillrect (int x1, int y1, int x2, int y2,
+ virtual void draw_fillrect (int x1, int y1, int x2, int y2,
float r, float g, float b, float a = 1.0f) =0;
/** Draw an unfilled rectangle (FIXME: [x1,x2] or [x1,x2[ ?) */
- virtual void draw_rect (int x1, int y1, int x2, int y2,
+ virtual void draw_rect (int x1, int y1, int x2, int y2,
float r, float g, float b, float a = 1.0f) =0;
/** Draw a singel pixel */
- virtual void draw_pixel (int x_pos, int y_pos,
+ virtual void draw_pixel (int x_pos, int y_pos,
float r, float g, float b, float a = 1.0f) =0;
/** Draw a circle */
@@ -106,7 +106,7 @@
/** Print a text centred to the given position */
virtual void print_center (FontHandle font, int x_pos, int y_pos, const
std::string& str) =0;
-
+
/** Print a text right aligned */
virtual void print_right (FontHandle font, int x_pos, int y_pos, const
std::string& str) =0;
};
Index: gui_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/gui_manager.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gui_manager.cxx 28 Mar 2003 16:16:00 -0000 1.20
+++ gui_manager.cxx 19 Apr 2003 10:23:18 -0000 1.21
@@ -38,7 +38,7 @@
void
GUIManager::draw (GraphicContext& gc)
{
- for (std::vector<Component*>::iterator i = components.begin ();
+ for (std::vector<Component*>::iterator i = components.begin ();
i != components.end (); ++i)
{
(*i)->draw (gc);
@@ -50,7 +50,7 @@
{
process_input (delta);
- for (std::vector<Component*>::iterator i = components.begin ();
+ for (std::vector<Component*>::iterator i = components.begin ();
i != components.end (); ++i)
{
(*i)->update (delta.get_time ());
@@ -69,16 +69,16 @@
case Input::PointerEventType:
process_pointer_event (i->pointer);
break;
-
+
case Input::ButtonEventType:
process_button_event (delta.get_absolute_time(), i->button);
break;
-
+
case Input::AxisEventType:
// AxisEvents can be ignored in the GUI, they are handled elsewhere
pout (PINGUS_DEBUG_GUI) << "GUIManager: AxisEvent: " << i->axis.dir
<< std::endl;
break;
-
+
default:
pwarn (PINGUS_DEBUG_GUI) << "GUIManager: unhandled event type " <<
i->type << std::endl;
break;
@@ -87,16 +87,16 @@
}
void
-GUIManager::add (Component* c, bool delete_component)
-{
- components.push_back(c);
+GUIManager::add (Component* c, bool delete_component)
+{
+ components.push_back(c);
UNUSED_ARG(delete_component);
}
void
GUIManager::remove (Component* c)
{
- /* components.erase(c); */
+ /* components.erase(c); */
UNUSED_ARG(c);
}
@@ -105,7 +105,7 @@
{
// we travel reversly through the component list, so that we get the
// top most component at first
- for (std::vector<Component*>::reverse_iterator i = components.rbegin ();
+ for (std::vector<Component*>::reverse_iterator i = components.rbegin ();
i != components.rend (); ++i)
{
if ((*i)->is_at (x, y))
@@ -117,7 +117,7 @@
bool
GUIManager::is_at (int x, int y)
{
- for (std::vector<Component*>::iterator i = components.begin ();
+ for (std::vector<Component*>::iterator i = components.begin ();
i != components.end (); ++i)
{
if ((*i)->is_at (x, y))
@@ -148,7 +148,7 @@
{
if (mouse_over_component != 0)
mouse_over_component->on_pointer_leave ();
-
+
comp->on_pointer_enter ();
mouse_over_component = comp;
}
@@ -165,7 +165,7 @@
mouse_over_component = 0;
}
}
-
+
}
void
@@ -184,7 +184,7 @@
// FIXME: add double click detection here
}
- else if (event.name == primary && event.state == Input::released)
+ else if (event.name == primary && event.state == Input::released)
{
/** Send the release event to the same component
which got the press event */
@@ -214,9 +214,9 @@
std::cout << "GUIManager: Got a release without a press,
possibly a bug" << std::endl;
}
}
-
+
// Secondary button
- if (event.name == secondary && event.state == Input::pressed)
+ if (event.name == secondary && event.state == Input::pressed)
{
secondary_pressed_component = comp;
comp->on_secondary_button_press (x_pos, y_pos);
Index: gui_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/gui_manager.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gui_manager.hxx 20 Dec 2002 01:22:32 -0000 1.13
+++ gui_manager.hxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -30,8 +30,8 @@
{
/** The GUIManager class holds a group of components and manages
them. It dispatches the GameDelta to each individual
- component
-
+ component
+
FIXME: We translate GameDelta into another 'language' which is
then understood by the GUI, this seems unclear, not sure at
which point it is best to split the GameDelta into
@@ -60,7 +60,7 @@
public:
GUIManager ();
virtual ~GUIManager () {}
-
+
virtual void draw (GraphicContext& gc);
virtual void update (const GameDelta& delta);
virtual void update (float delta) { UNUSED_ARG (delta); }
@@ -74,9 +74,9 @@
/** */
void remove (Component*);
- Component* component_at (int x, int y);
+ Component* component_at (int x, int y);
virtual bool is_at (int x, int y);
-
+
private:
GUIManager (const GUIManager&);
GUIManager& operator= (const GUIManager&);
Index: gui_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/gui_screen.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gui_screen.cxx 19 Feb 2003 09:51:44 -0000 1.1
+++ gui_screen.cxx 19 Apr 2003 10:23:18 -0000 1.2
@@ -53,7 +53,7 @@
update (delta.get_time ());
- for (Input::EventLst::const_iterator i = delta.get_events ().begin ();
+ for (Input::EventLst::const_iterator i = delta.get_events ().begin ();
i != delta.get_events ().end (); ++i)
{
switch (i->type)
@@ -81,7 +81,7 @@
case Input::ScrollEventType:
{
-
+
}
break;
@@ -97,13 +97,13 @@
{
//std::cout << "GUIScreen::process_button_event (Input::ButtonEvent* event)"
<< std::endl;
- if (event.state == Input::pressed)
+ if (event.state == Input::pressed)
{
switch (event.name)
{
case Input::primary:
// ignoring, handled in the gui_manager
- break;
+ break;
case Input::secondary:
// ignoring, handled in the gui_manager
break;
@@ -124,13 +124,13 @@
break;
}
}
- else if (event.state == Input::released)
+ else if (event.state == Input::released)
{
switch (event.name)
{
case Input::primary:
// ignoring, handled in the gui_manager
- break;
+ break;
case Input::secondary:
// ignoring, handled in the gui_manager
break;
@@ -153,7 +153,7 @@
}
else
{
- perr(PINGUS_DEBUG_GUI) << "GUIScreen::process_button_event: got unknown
event.state: "
+ perr(PINGUS_DEBUG_GUI) << "GUIScreen::process_button_event: got unknown
event.state: "
<< event.state << std::endl;;
}
}
Index: gui_screen.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/gui_screen.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gui_screen.hxx 19 Feb 2003 09:51:44 -0000 1.1
+++ gui_screen.hxx 19 Apr 2003 10:23:18 -0000 1.2
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -66,7 +66,7 @@
private:
void process_button_event (const Input::ButtonEvent& event);
-
+
GUIScreen (const GUIScreen&);
GUIScreen& operator= (const GUIScreen&);
};
Index: input_debug_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/input_debug_screen.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- input_debug_screen.cxx 19 Feb 2003 09:51:44 -0000 1.1
+++ input_debug_screen.cxx 19 Apr 2003 10:23:18 -0000 1.2
@@ -48,7 +48,7 @@
InputDebugScreen::update (const GameDelta& delta)
{
std::cout << "InputDebugScreen::update (" << delta.get_time () << ")" <<
std::endl;
- for (Input::EventLst::const_iterator i = delta.get_events ().begin ();
+ for (Input::EventLst::const_iterator i = delta.get_events ().begin ();
i != delta.get_events ().end ();
++i)
{
@@ -67,8 +67,8 @@
break;
case ScrollEventType:
- {
- std::cout << "InputDebugScreen: Scroll event : "
+ {
+ std::cout << "InputDebugScreen: Scroll event : "
<< i->scroll.x_delta << " " << i->scroll.y_delta <<
std::endl;
}
break;
@@ -89,7 +89,7 @@
}
/** Called once the screen gets replaced or poped or shadowed by a
- newly pushed screen */
+ newly pushed screen */
void
InputDebugScreen::on_shutdown ()
{
Index: input_debug_screen.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/input_debug_screen.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- input_debug_screen.hxx 19 Feb 2003 09:51:44 -0000 1.1
+++ input_debug_screen.hxx 19 Apr 2003 10:23:18 -0000 1.2
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -25,7 +25,7 @@
class InputDebugScreen : public Screen
{
private:
-
+
public:
InputDebugScreen ();
virtual ~InputDebugScreen ();
@@ -41,7 +41,7 @@
void on_startup ();
/** Called once the screen gets replaced or poped or shadowed by a
- newly pushed screen */
+ newly pushed screen */
void on_shutdown ();
};
Index: root_gui_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/root_gui_manager.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- root_gui_manager.cxx 18 Apr 2003 12:48:50 -0000 1.8
+++ root_gui_manager.cxx 19 Apr 2003 10:23:18 -0000 1.9
@@ -26,7 +26,7 @@
RootGUIManager::RootGUIManager (Input::Controller* c)
: controller(c)
-{
+{
}
RootGUIManager::~RootGUIManager ()
@@ -40,7 +40,7 @@
assert (controller);
//GUIManager::update (delta);
//process_input (controller->get_events ());
-
+
UNUSED_ARG(delta);
}
Index: root_gui_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/root_gui_manager.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- root_gui_manager.hxx 27 Sep 2002 11:26:46 -0000 1.5
+++ root_gui_manager.hxx 19 Apr 2003 10:23:18 -0000 1.6
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -29,7 +29,7 @@
namespace GUI
{
- /** Root GUI manager
+ /** Root GUI manager
*/
class RootGUIManager : public GUIManager
{
@@ -39,9 +39,9 @@
public:
RootGUIManager (Input::Controller* c);
~RootGUIManager ();
-
+
void update (float delta);
-
+
private:
RootGUIManager (const RootGUIManager&);
RootGUIManager& operator= (const RootGUIManager&);
Index: screen.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/screen.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- screen.hxx 19 Feb 2003 09:51:44 -0000 1.1
+++ screen.hxx 19 Apr 2003 10:23:18 -0000 1.2
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -30,11 +30,11 @@
class Screen
{
private:
-
+
public:
Screen () { }
virtual ~Screen () {}
-
+
/** Draw this screen @return true if draw was successfull, false if
frameskip has taken place ('causes a skip of flip_display) */
virtual bool draw (GraphicContext& gc) =0;
@@ -49,9 +49,9 @@
virtual void on_startup () {}
/** Called once the screen gets replaced or poped or shadowed by a
- newly pushed screen */
+ newly pushed screen */
virtual void on_shutdown () {}
-
+
private:
Screen (const Screen&);
Screen& operator= (const Screen&);
Index: screen_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/screen_manager.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- screen_manager.cxx 15 Apr 2003 19:06:50 -0000 1.8
+++ screen_manager.cxx 19 Apr 2003 10:23:18 -0000 1.9
@@ -59,7 +59,7 @@
cursor = new Cursor("cursors/animcross", "core");
Display::add_flip_screen_hook(cursor);
CL_MouseCursor::hide();
- }
+ }
DeltaManager delta_manager;
@@ -83,13 +83,13 @@
input_controller->update (time_delta);
// Fill the delta with values
- GameDelta delta (time_delta, delta_manager.get_absolute(),
+ GameDelta delta (time_delta, delta_manager.get_absolute(),
input_controller->get_events ());
last_screen = get_current_screen();
// Most likly the screen will get changed in this update call
- get_current_screen()->update (delta);
+ get_current_screen()->update (delta);
if (cursor)
cursor->update(time_delta);
@@ -120,7 +120,7 @@
// Last screen has poped, so we are going to end here
if (screens.empty())
continue;
-
+
// skip draw if the screen changed to avoid glitches
if (last_screen == get_current_screen())
{
@@ -135,7 +135,7 @@
// Stupid hack to make this thing take less CPU
CL_System::sleep (0);
- }
+ }
Display::remove_flip_screen_hook(cursor);
delete cursor;
@@ -245,12 +245,12 @@
{
float time_delta = delta_manager.getset ();
passed_time += time_delta;
-
+
int border_x = int((CL_Display::get_width ()/2) * (1.0f - progress));
int border_y = int((CL_Display::get_height ()/2) * (1.0f - progress));
old_screen->draw (display_gc);
- CL_Display::push_clip_rect(CL_ClipRect (0 + border_x,
+ CL_Display::push_clip_rect(CL_ClipRect (0 + border_x,
0 + border_y,
CL_Display::get_width () -
border_x,
CL_Display::get_height () -
border_y));
@@ -265,11 +265,11 @@
Display::flip_display ();
CL_System::keep_alive ();
-
+
progress = passed_time/1.0f;
}
-#endif
+#endif
}
void
Index: screen_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/screen_manager.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- screen_manager.hxx 3 Apr 2003 17:03:24 -0000 1.3
+++ screen_manager.hxx 19 Apr 2003 10:23:18 -0000 1.4
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -57,7 +57,7 @@
/** Replace the current screen */
void replace_screen (Screen*, bool delete_screen = false);
-
+
/** Add a screen on top of another screen */
void push_screen (Screen*, bool delete_screen = false);
@@ -74,7 +74,7 @@
/** Replace the current screen */
void real_replace_screen (const ScreenPtr&);
-
+
/** Remove the current screen and fall back to the last one */
void real_pop_screen ();
@@ -84,7 +84,7 @@
/** @return a pointer to the current Screen */
ScreenPtr& get_current_screen();
-public:
+public:
static ScreenManager* instance ();
static void init();
static void deinit();
Index: screen_manager_impl.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/screen_manager_impl.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- screen_manager_impl.hxx 19 Feb 2003 09:51:44 -0000 1.1
+++ screen_manager_impl.hxx 19 Apr 2003 10:23:18 -0000 1.2
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -31,7 +31,7 @@
~ScreenManagerImpl ();
void display ();
-
+
private:
ScreenManagerImpl (const ScreenManagerImpl&);
ScreenManagerImpl& operator= (const ScreenManagerImpl&);
Index: screen_ptr.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/screen_ptr.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- screen_ptr.cxx 25 Mar 2003 00:37:44 -0000 1.2
+++ screen_ptr.cxx 19 Apr 2003 10:23:18 -0000 1.3
@@ -22,7 +22,7 @@
#include "screen_ptr.hxx"
void
-ScreenPtr::decrease_refcount()
+ScreenPtr::decrease_refcount()
{
//std::cout << "ScreenPtr::decrease_refcount(): " << screen << std::endl;
@@ -31,10 +31,10 @@
//std::cout << "*ref_count: " << *ref_count << std::endl;
*ref_count -= 1;
-
+
if (*ref_count == 0)
{
- //std::cout << "XXXXXXXXXXXXXX ScreenPtr: deleting: "
+ //std::cout << "XXXXXXXXXXXXXX ScreenPtr: deleting: "
//<< screen << " = " << typeid(*screen).name() << std::endl;
delete screen;
delete ref_count;
@@ -51,7 +51,7 @@
{
//std::cout << "*ref_count: " << *ref_count << std::endl;
*ref_count += 1;
- }
+ }
}
/* EOF */
Index: screen_ptr.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/screen_ptr.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- screen_ptr.hxx 19 Feb 2003 09:51:44 -0000 1.1
+++ screen_ptr.hxx 19 Apr 2003 10:23:18 -0000 1.2
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2002 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -33,7 +33,7 @@
long* ref_count;
public:
- ScreenPtr()
+ ScreenPtr()
: screen(0), delete_it(false), ref_count(0)
{
}
@@ -68,11 +68,11 @@
if (this != &ptr)
{
decrease_refcount();
-
+
screen = ptr.screen;
delete_it = ptr.delete_it;
ref_count = ptr.ref_count;
-
+
increase_refcount();
}
return *this;
@@ -96,7 +96,7 @@
Screen* get()
{
return screen;
- }
+ }
private:
void decrease_refcount();
Index: surface_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/surface_button.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface_button.cxx 25 Mar 2003 00:37:44 -0000 1.7
+++ surface_button.cxx 19 Apr 2003 10:23:18 -0000 1.8
@@ -64,7 +64,7 @@
SurfaceButton::on_primary_button_press (int x, int y)
{
pressed = true;
-
+
UNUSED_ARG(x);
UNUSED_ARG(y);
}
@@ -73,7 +73,7 @@
SurfaceButton::on_primary_button_release (int x, int y)
{
pressed = false;
-
+
UNUSED_ARG(x);
UNUSED_ARG(y);
}
Index: surface_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/surface_button.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface_button.hxx 3 Apr 2003 17:03:24 -0000 1.7
+++ surface_button.hxx 19 Apr 2003 10:23:18 -0000 1.8
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -56,7 +56,7 @@
virtual void on_pointer_enter ();
virtual void on_pointer_leave ();
-
+
virtual void on_click() =0;
private:
SurfaceButton (const SurfaceButton&);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/gui button.hxx,1.4,1.5 component.hxx,1.13,1.14 cursor.cxx,1.2,1.3 cursor.hxx,1.1,1.2 display.cxx,1.2,1.3 display.hxx,1.2,1.3display_graphic_context.cxx,1.4,1.5 display_graphic_context.hxx,1.3,1.4 game_delta.hxx,1.1,1.2 game_delta_recorder.hxx,1.1,1.2 graphic_context.hxx,1.3,1.4 gui_manager.cxx,1.20,1.21 gui_manager.hxx,1.13,1.14 gui_screen.cxx,1.1,1.2 gui_screen.hxx,1.1,1.2 input_debug_screen.cxx,1.1,1.2 input_debug_screen.hxx,1.1,1.2 root_gui_manager.cxx,1.8,1.9 root_gui_manager.hxx,1.5,1.6 screen.hxx,1.1,1.2 screen_manager.cxx,1.8,1.9 screen_manager.hxx,1.3,1.4 screen_manager_impl.hxx,1.1,1.2 screen_ptr.cxx,1.2,1.3 screen_ptr.hxx,1.1,1.2 surface_button.cxx,1.7,1.8 surface_button.hxx,1.7,1.8,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.9,1.10 bumper_obj.hxx,1.9,1.10 conveyor_belt_obj.cxx,1.7,1.8 conveyor_belt_obj.hxx,1.7,1.8 entrance_obj.cxx,1.7,1.8 entrance_obj.hxx,1.3,1.4 exit_obj.cxx,1.1,1.2 exit_obj.hxx,1.2,1.3 fake_exit_obj.cxx,1.10,1.11 fake_exit_obj.hxx,1.10,1.11 groundpiece_obj.cxx,1.14,1.15 groundpiece_obj.hxx,1.4,1.5 guillotine_obj.cxx,1.9,1.10 guillotine_obj.hxx,1.9,1.10 hammer_obj.cxx,1.10,1.11 hammer_obj.hxx,1.9,1.10 hotspot_obj.cxx,1.2,1.3 hotspot_obj.hxx,1.5,1.6 ice_block_obj.cxx,1.6,1.7 ice_block_obj.hxx,1.5,1.6 info_box_obj.cxx,1.4,1.5 info_box_obj.hxx,1.6,1.7 laser_exit_obj.cxx,1.10,1.11 laser_exit_obj.hxx,1.9,1.10 liquid_obj.cxx,1.5,1.6 liquid_obj.hxx,1.5,1.6 prefab_obj.hxx,1.3,1.4 smasher_obj.cxx,1.8,1.9 smasher_obj.hxx,1.10,1.11 solid_color_background_obj.cxx,1.6,1.7 solid_color_background_obj.hxx,1.6,1.7 spike_obj.cxx,1.10,1.11 spike_obj.hxx,1.10,1.11 starfield_background_obj.cxx,1.5,1.6 starfield_background_obj.hxx,1.6,1.7surface_background_obj.cxx,1.9,1.10 surface_background_obj.hxx,1.6,1.7 switch_door_obj.cxx,1.7,1.8 switch_door_obj.hxx,1.7,1.8 switch_door_switch_obj.cxx,1.2,1.3 switch_door_switch_obj.hxx,1.4,1.5 teleporter_obj.cxx,1.9,1.10 teleporter_obj.hxx,1.9,1.10 teleporter_target_obj.cxx,1.6,1.7 teleporter_target_obj.hxx,1.4,1.5thunderstorm_background_obj.hxx,1.4,1.5
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/po sv.po,1.1,1.2
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.9,1.10 bumper_obj.hxx,1.9,1.10 conveyor_belt_obj.cxx,1.7,1.8 conveyor_belt_obj.hxx,1.7,1.8 entrance_obj.cxx,1.7,1.8 entrance_obj.hxx,1.3,1.4 exit_obj.cxx,1.1,1.2 exit_obj.hxx,1.2,1.3 fake_exit_obj.cxx,1.10,1.11 fake_exit_obj.hxx,1.10,1.11 groundpiece_obj.cxx,1.14,1.15 groundpiece_obj.hxx,1.4,1.5 guillotine_obj.cxx,1.9,1.10 guillotine_obj.hxx,1.9,1.10 hammer_obj.cxx,1.10,1.11 hammer_obj.hxx,1.9,1.10 hotspot_obj.cxx,1.2,1.3 hotspot_obj.hxx,1.5,1.6 ice_block_obj.cxx,1.6,1.7 ice_block_obj.hxx,1.5,1.6 info_box_obj.cxx,1.4,1.5 info_box_obj.hxx,1.6,1.7 laser_exit_obj.cxx,1.10,1.11 laser_exit_obj.hxx,1.9,1.10 liquid_obj.cxx,1.5,1.6 liquid_obj.hxx,1.5,1.6 prefab_obj.hxx,1.3,1.4 smasher_obj.cxx,1.8,1.9 smasher_obj.hxx,1.10,1.11 solid_color_background_obj.cxx,1.6,1.7 solid_color_background_obj.hxx,1.6,1.7 spike_obj.cxx,1.10,1.11 spike_obj.hxx,1.10,1.11 starfield_background_obj.cxx,1.5,1.6 starfield_background_obj.hxx,1.6,1.7surface_background_obj.cxx,1.9,1.10 surface_background_obj.hxx,1.6,1.7 switch_door_obj.cxx,1.7,1.8 switch_door_obj.hxx,1.7,1.8 switch_door_switch_obj.cxx,1.2,1.3 switch_door_switch_obj.hxx,1.4,1.5 teleporter_obj.cxx,1.9,1.10 teleporter_obj.hxx,1.9,1.10 teleporter_target_obj.cxx,1.6,1.7 teleporter_target_obj.hxx,1.4,1.5thunderstorm_background_obj.hxx,1.4,1.5
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/po sv.po,1.1,1.2
- Index(es):