[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4107 - in branches/pingus-0.7.3/src: . components editor g
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r4107 - in branches/pingus-0.7.3/src: . components editor gui input screen tinygettext worldmap |
Date: |
Thu, 18 Mar 2010 12:52:12 +0100 |
Author: grumbel
Date: 2010-03-18 12:52:00 +0100 (Thu, 18 Mar 2010)
New Revision: 4107
Modified:
branches/pingus-0.7.3/src/blitter_impl.hpp
branches/pingus-0.7.3/src/client.cpp
branches/pingus-0.7.3/src/collider.cpp
branches/pingus-0.7.3/src/components/action_button.cpp
branches/pingus-0.7.3/src/components/button_panel.cpp
branches/pingus-0.7.3/src/components/hurry_up.cpp
branches/pingus-0.7.3/src/components/menu_button.cpp
branches/pingus-0.7.3/src/components/menu_button.hpp
branches/pingus-0.7.3/src/components/playfield.cpp
branches/pingus-0.7.3/src/components/playfield.hpp
branches/pingus-0.7.3/src/components/smallmap.cpp
branches/pingus-0.7.3/src/demo_session.cpp
branches/pingus-0.7.3/src/editor/context_menu.cpp
branches/pingus-0.7.3/src/editor/context_menu.hpp
branches/pingus-0.7.3/src/editor/editor_screen.hpp
branches/pingus-0.7.3/src/editor/level_head.cpp
branches/pingus-0.7.3/src/editor/panel_buttons.cpp
branches/pingus-0.7.3/src/editor/viewport.cpp
branches/pingus-0.7.3/src/gui/component.hpp
branches/pingus-0.7.3/src/gui/surface_button.cpp
branches/pingus-0.7.3/src/input/evdev_device.cpp
branches/pingus-0.7.3/src/pingus.hpp
branches/pingus-0.7.3/src/screen/gui_screen.hpp
branches/pingus-0.7.3/src/screen/input_debug_screen.cpp
branches/pingus-0.7.3/src/tinygettext/po_file_reader.cpp
branches/pingus-0.7.3/src/worldmap/level_dot.cpp
branches/pingus-0.7.3/src/worldmap/manager.cpp
branches/pingus-0.7.3/src/worldmap/path_drawable.cpp
branches/pingus-0.7.3/src/worldmap/surface_drawable.cpp
branches/pingus-0.7.3/src/worldmap/world_dot.hpp
branches/pingus-0.7.3/src/worldmap/worldmap.cpp
branches/pingus-0.7.3/src/worldobj.cpp
Log:
Quick set of fixes to make 0.7.2 compile on current gcc versions
Modified: branches/pingus-0.7.3/src/blitter_impl.hpp
===================================================================
--- branches/pingus-0.7.3/src/blitter_impl.hpp 2010-03-18 11:38:24 UTC (rev
4106)
+++ branches/pingus-0.7.3/src/blitter_impl.hpp 2010-03-18 11:52:00 UTC (rev
4107)
@@ -53,16 +53,16 @@
return (spitch * height) - (y * spitch + x) - 1;
}
- static inline int get_x(int width, int height, int x, int y) {
UNUSED_ARG(height); UNUSED_ARG(y);
+ static inline int get_x(int width, int height, int x, int y) {
return width - x - 1;
}
- static inline int get_y(int width, int height, int x, int y) {
UNUSED_ARG(width); UNUSED_ARG(x);
+ static inline int get_y(int width, int height, int x, int y) {
return height - y - 1;
}
- static inline int get_width (int width, int height) { UNUSED_ARG(height);
return width; }
- static inline int get_height(int width, int height) { UNUSED_ARG(width);
return height; }
+ static inline int get_width (int width, int height) { return width; }
+ static inline int get_height(int width, int height) { return height; }
};
/** Rotate a surface 270 degree */
@@ -73,63 +73,54 @@
}
static inline int get_x(int width, int height, int x, int y) {
- UNUSED_ARG(width); UNUSED_ARG(height); UNUSED_ARG(x);
- return y;
+ return y;
}
static inline int get_y(int width, int height, int x, int y) {
- UNUSED_ARG(height);
- UNUSED_ARG(y);
-
+
return width - x - 1;
}
- static inline int get_width (int width, int height) { UNUSED_ARG(width);
return height; }
- static inline int get_height(int width, int height) { UNUSED_ARG(height);
return width; }
+ static inline int get_width (int width, int height) { return height; }
+ static inline int get_height(int width, int height) { return width; }
};
/** flip a surface */
struct transform_flip
{
static inline int get_index(int width, int height, int spitch, int tpitch,
int x, int y) {
- UNUSED_ARG(height);
- return (y * spitch) + (width - x - 1);
+ return (y * spitch) + (width - x - 1);
}
static inline int get_x(int width, int height, int x, int y) {
- UNUSED_ARG(height); UNUSED_ARG(y);
- return width - x - 1;
+ return width - x - 1;
}
static inline int get_y(int width, int height, int x, int y) {
- UNUSED_ARG(width); UNUSED_ARG(height); UNUSED_ARG(x);
- return y;
+ return y;
}
- static inline int get_width (int width, int height) { UNUSED_ARG(height);
return width; }
- static inline int get_height(int width, int height) { UNUSED_ARG(width);
return height; }
+ static inline int get_width (int width, int height) { return width; }
+ static inline int get_height(int width, int height) { return height; }
};
/** Rotate a surface 90 degree and then flip it */
struct transform_rot90_flip
{
static inline int get_index(int width, int height, int spitch, int tpitch,
int x, int y) {
- UNUSED_ARG(width);
- return (x * tpitch) + y;
+ return (x * tpitch) + y;
}
static inline int get_x(int width, int height, int x, int y) {
- UNUSED_ARG(width); UNUSED_ARG(height); UNUSED_ARG(x);
- return y;
+ return y;
}
static inline int get_y(int width, int height, int x, int y) {
- UNUSED_ARG(width); UNUSED_ARG(height); UNUSED_ARG(y);
- return x;
+ return x;
}
- static inline int get_width (int width, int height) { UNUSED_ARG(width);
return height; }
- static inline int get_height(int width, int height) { UNUSED_ARG(height);
return width; }
+ static inline int get_width (int width, int height) { return height; }
+ static inline int get_height(int width, int height) { return width; }
};
/** Rotate a surface 180 degree and then flip it */
@@ -140,17 +131,15 @@
}
static inline int get_x(int width, int height, int x, int y) {
- UNUSED_ARG(width); UNUSED_ARG(height); UNUSED_ARG(y);
- return x;
+ return x;
}
static inline int get_y(int width, int height, int x, int y) {
- UNUSED_ARG(width); UNUSED_ARG(x);
- return height - y - 1;
+ return height - y - 1;
}
- static inline int get_width (int width, int height) { UNUSED_ARG(height);
return width; }
- static inline int get_height(int width, int height) { UNUSED_ARG(width);
return height; }
+ static inline int get_width (int width, int height) { return width; }
+ static inline int get_height(int width, int height) { return height; }
};
/** Rotate a surface 270 degree and then flip it */
@@ -161,17 +150,15 @@
}
static inline int get_x(int width, int height, int x, int y) {
- UNUSED_ARG(width); UNUSED_ARG(x);
- return height - y - 1;
+ return height - y - 1;
}
static inline int get_y(int width, int height, int x, int y) {
- UNUSED_ARG(height); UNUSED_ARG(y);
- return width - x - 1;
+ return width - x - 1;
}
- static inline int get_width (int width, int height) { UNUSED_ARG(width);
return height; }
- static inline int get_height(int width, int height) { UNUSED_ARG(height);
return width; }
+ static inline int get_width (int width, int height) { return height; }
+ static inline int get_height(int width, int height) { return width; }
};
template<class TransF>
Modified: branches/pingus-0.7.3/src/client.cpp
===================================================================
--- branches/pingus-0.7.3/src/client.cpp 2010-03-18 11:38:24 UTC (rev
4106)
+++ branches/pingus-0.7.3/src/client.cpp 2010-03-18 11:52:00 UTC (rev
4107)
@@ -184,8 +184,7 @@
Client::process_axis_event (const Input::AxisEvent& event)
{
// std::cout << "Client::process_axis_event ()" << std::endl;
- UNUSED_ARG(event);
-}
+ }
bool
Client::replay()
Modified: branches/pingus-0.7.3/src/collider.cpp
===================================================================
--- branches/pingus-0.7.3/src/collider.cpp 2010-03-18 11:38:24 UTC (rev
4106)
+++ branches/pingus-0.7.3/src/collider.cpp 2010-03-18 11:52:00 UTC (rev
4107)
@@ -33,10 +33,7 @@
bool Collider::operator() (World* const world, Vector3f current_pos,
const Vector3f& step_vector) const
{
- UNUSED_ARG(world);
- UNUSED_ARG(current_pos);
- UNUSED_ARG(step_vector);
-
+
return false;
}
Modified: branches/pingus-0.7.3/src/components/action_button.cpp
===================================================================
--- branches/pingus-0.7.3/src/components/action_button.cpp 2010-03-18
11:38:24 UTC (rev 4106)
+++ branches/pingus-0.7.3/src/components/action_button.cpp 2010-03-18
11:52:00 UTC (rev 4107)
@@ -226,9 +226,7 @@
pressed = true;
}
- UNUSED_ARG(x);
- UNUSED_ARG(y);
-}
+ }
ForwardButton::ForwardButton (TrueServer* s, int x, int y)
: server (s),
@@ -274,9 +272,7 @@
{
server->set_fast_forward(!server->get_fast_forward());
- UNUSED_ARG(x);
- UNUSED_ARG(y);
-}
+ }
PauseButton::PauseButton (TrueServer* s, int x, int y)
: server (s),
@@ -322,9 +318,7 @@
{
server->set_pause(!server->get_pause());
- UNUSED_ARG(x);
- UNUSED_ARG(y);
-}
+ }
/* EOF */
Modified: branches/pingus-0.7.3/src/components/button_panel.cpp
===================================================================
--- branches/pingus-0.7.3/src/components/button_panel.cpp 2010-03-18
11:38:24 UTC (rev 4106)
+++ branches/pingus-0.7.3/src/components/button_panel.cpp 2010-03-18
11:52:00 UTC (rev 4107)
@@ -150,9 +150,7 @@
void
ButtonPanel::on_primary_button_release(int x, int y)
{
- UNUSED_ARG(x);
- UNUSED_ARG(y);
-}
+ }
/// Select the next action
void
Modified: branches/pingus-0.7.3/src/components/hurry_up.cpp
===================================================================
--- branches/pingus-0.7.3/src/components/hurry_up.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/components/hurry_up.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -54,8 +54,7 @@
CL_Display::get_height()/2 - font->get_height(),
"Up");
}
- UNUSED_ARG(gc);
-#endif
+ #endif
}
void
Modified: branches/pingus-0.7.3/src/components/menu_button.cpp
===================================================================
--- branches/pingus-0.7.3/src/components/menu_button.cpp 2010-03-18
11:38:24 UTC (rev 4106)
+++ branches/pingus-0.7.3/src/components/menu_button.cpp 2010-03-18
11:52:00 UTC (rev 4107)
@@ -88,14 +88,12 @@
gc.draw(surface_p, Vector2i(x_pos, y_pos));
gc.print_center(font_large, x_pos, y_pos - 28, text);
}
- UNUSED_ARG(gc);
-}
+ }
void
MenuButton::update (float delta)
{
- UNUSED_ARG(delta);
-}
+ }
void
MenuButton::on_pointer_enter ()
Modified: branches/pingus-0.7.3/src/components/menu_button.hpp
===================================================================
--- branches/pingus-0.7.3/src/components/menu_button.hpp 2010-03-18
11:38:24 UTC (rev 4106)
+++ branches/pingus-0.7.3/src/components/menu_button.hpp 2010-03-18
11:52:00 UTC (rev 4107)
@@ -64,7 +64,7 @@
void on_pointer_press ();
void on_pointer_release ();
- void on_primary_button_click (int x, int y) { on_click (); UNUSED_ARG(x);
UNUSED_ARG(y); }
+ void on_primary_button_click (int x, int y) { on_click (); }
virtual void on_click ();
Modified: branches/pingus-0.7.3/src/components/playfield.cpp
===================================================================
--- branches/pingus-0.7.3/src/components/playfield.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/components/playfield.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -175,9 +175,7 @@
void
Playfield::on_primary_button_press(int x, int y)
{
- UNUSED_ARG(x);
- UNUSED_ARG(y);
-
+
if (current_pingu)
{
server->send_pingu_action_event(current_pingu,
buttons->get_action_name());
@@ -197,9 +195,7 @@
void
Playfield::on_secondary_button_release (int x, int y)
{
- UNUSED_ARG(x);
- UNUSED_ARG(y);
-
+
mouse_scrolling = false;
}
Modified: branches/pingus-0.7.3/src/components/playfield.hpp
===================================================================
--- branches/pingus-0.7.3/src/components/playfield.hpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/components/playfield.hpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -89,7 +89,7 @@
/// Members used to communicate between different screen objs
void set_server(Server*);
- bool is_at (int x, int y) { UNUSED_ARG(x); UNUSED_ARG(y); return true; }
+ bool is_at (int x, int y) { return true; }
Rect get_rect() const { return rect; }
void update_layout() {}
private:
Modified: branches/pingus-0.7.3/src/components/smallmap.cpp
===================================================================
--- branches/pingus-0.7.3/src/components/smallmap.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/components/smallmap.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -186,9 +186,7 @@
SmallMap::on_primary_button_release(int x, int y)
{
scroll_mode = false;
- UNUSED_ARG(x);
- UNUSED_ARG(y);
-}
+ }
void
SmallMap::on_pointer_enter ()
Modified: branches/pingus-0.7.3/src/demo_session.cpp
===================================================================
--- branches/pingus-0.7.3/src/demo_session.cpp 2010-03-18 11:38:24 UTC (rev
4106)
+++ branches/pingus-0.7.3/src/demo_session.cpp 2010-03-18 11:52:00 UTC (rev
4107)
@@ -97,8 +97,7 @@
void
DemoSession::update(float delta)
{
- UNUSED_ARG(delta);
-
+
// FIXME: Duplicate all timing code here?!
server->update();
demo_player->update();
Modified: branches/pingus-0.7.3/src/editor/context_menu.cpp
===================================================================
--- branches/pingus-0.7.3/src/editor/context_menu.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/editor/context_menu.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -221,8 +221,7 @@
void
ContextMenu::update(float delta)
{
- UNUSED_ARG(delta);
-
+
if (displayed_child != actions[selected_action_offset].child)
{
if (displayed_child)
Modified: branches/pingus-0.7.3/src/editor/context_menu.hpp
===================================================================
--- branches/pingus-0.7.3/src/editor/context_menu.hpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/editor/context_menu.hpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -32,8 +32,8 @@
class Viewport;
class ContextMenu;
-typedef enum ItemModifier { REMOVE, ROTATE, SET_OWNER, SET_DIRECTION,
- STRETCH, SET_Z_POS };
+enum ItemModifier { REMOVE, ROTATE, SET_OWNER, SET_DIRECTION,
+ STRETCH, SET_Z_POS };
class ContextItem {
public:
Modified: branches/pingus-0.7.3/src/editor/editor_screen.hpp
===================================================================
--- branches/pingus-0.7.3/src/editor/editor_screen.hpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/editor/editor_screen.hpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -27,7 +27,6 @@
class DrawingContext;
class FileDialog;
-class GUI::GUIManager;
class Pathname;
namespace Editor {
Modified: branches/pingus-0.7.3/src/editor/level_head.cpp
===================================================================
--- branches/pingus-0.7.3/src/editor/level_head.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/editor/level_head.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -125,8 +125,7 @@
void
LevelHead::update(float delta)
{
- UNUSED_ARG(delta);
- // FIXME: Should only update this information if it has changed.
+ // FIXME: Should only update this information if it has changed.
impl->levelname = name->get_string();
impl->description = desc->get_string();
}
Modified: branches/pingus-0.7.3/src/editor/panel_buttons.cpp
===================================================================
--- branches/pingus-0.7.3/src/editor/panel_buttons.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/editor/panel_buttons.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -83,9 +83,7 @@
void
PanelButton::on_primary_button_click(int x, int y)
{
- UNUSED_ARG(x);
- UNUSED_ARG(y);
- panel->set_selected_button(this);
+ panel->set_selected_button(this);
}
// Standard exit button
Modified: branches/pingus-0.7.3/src/editor/viewport.cpp
===================================================================
--- branches/pingus-0.7.3/src/editor/viewport.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/editor/viewport.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -345,8 +345,6 @@
void
Viewport::update(float delta)
{
- UNUSED_ARG(delta);
-
if (current_action == SCROLLING)
state.set_pos(state.get_pos() + Vector2f(mouse_screen_pos -
drag_screen_pos) * delta * 5.0f);
Modified: branches/pingus-0.7.3/src/gui/component.hpp
===================================================================
--- branches/pingus-0.7.3/src/gui/component.hpp 2010-03-18 11:38:24 UTC (rev
4106)
+++ branches/pingus-0.7.3/src/gui/component.hpp 2010-03-18 11:52:00 UTC (rev
4107)
@@ -54,25 +54,25 @@
virtual bool is_visible() const { return visible; }
virtual void draw (DrawingContext& gc) =0;
- virtual void update (float delta) { UNUSED_ARG(delta);}
+ virtual void update (float delta) { }
- virtual bool is_at (int x, int y) { UNUSED_ARG(x); UNUSED_ARG(y); return
false; }
+ virtual bool is_at (int x, int 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); }
+ virtual void on_primary_button_press (int x, int 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); }
+ virtual void on_primary_button_release (int x, int y) { }
- virtual void on_secondary_button_press (int x, int y) { UNUSED_ARG(x);
UNUSED_ARG(y); }
- virtual void on_secondary_button_release (int x, int y) { UNUSED_ARG(x);
UNUSED_ARG(y); }
+ virtual void on_secondary_button_press (int x, int y) { }
+ virtual void on_secondary_button_release (int x, int y) { }
/** Gets emmited when a button is pressed and released over the
same component */
- virtual void on_primary_button_click (int x, int y) { UNUSED_ARG(x);
UNUSED_ARG(y); }
+ virtual void on_primary_button_click (int x, int y) { }
- virtual void on_secondary_button_click (int x, int y) { UNUSED_ARG(x);
UNUSED_ARG(y); }
+ virtual void on_secondary_button_click (int x, int y) { }
/** Emmitted when pointer enters the region of the component */
virtual void on_pointer_enter () {}
@@ -82,11 +82,11 @@
/** Emitted when the pointer moved, x and y are the new pointer
coordinates */
- virtual void on_pointer_move (int x, int y) { UNUSED_ARG(x); UNUSED_ARG(y); }
+ virtual void on_pointer_move (int x, int y) { }
/** Emitted whenever a keyboard character is pressed. Only certain
components should implement this */
- virtual void on_key_pressed(const unsigned short c) { UNUSED_ARG(c); }
+ virtual void on_key_pressed(const unsigned short c) { }
GroupComponent* get_parent() const;
void set_parent(GroupComponent* p);
Modified: branches/pingus-0.7.3/src/gui/surface_button.cpp
===================================================================
--- branches/pingus-0.7.3/src/gui/surface_button.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/gui/surface_button.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -66,9 +66,6 @@
SurfaceButton::on_primary_button_press (int x, int y)
{
pressed = true;
-
- UNUSED_ARG(x);
- UNUSED_ARG(y);
}
void
@@ -76,8 +73,8 @@
{
pressed = false;
- UNUSED_ARG(x);
- UNUSED_ARG(y);
+
+
}
void
@@ -96,8 +93,6 @@
SurfaceButton::on_primary_button_click (int x, int y)
{
on_click();
- UNUSED_ARG(x);
- UNUSED_ARG(y);
}
} // namespace GUI
Modified: branches/pingus-0.7.3/src/input/evdev_device.cpp
===================================================================
--- branches/pingus-0.7.3/src/input/evdev_device.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/input/evdev_device.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -25,6 +25,8 @@
#include <stdexcept>
#include <iostream>
#include <errno.h>
+#include <string.h>
+#include <stdio.h>
#include "evdev_device.hpp"
Modified: branches/pingus-0.7.3/src/pingus.hpp
===================================================================
--- branches/pingus-0.7.3/src/pingus.hpp 2010-03-18 11:38:24 UTC (rev
4106)
+++ branches/pingus-0.7.3/src/pingus.hpp 2010-03-18 11:52:00 UTC (rev
4107)
@@ -43,8 +43,6 @@
# include <assert.h>
#endif
-#define UNUSED_ARG(a) do {/* null */} while (&a == 0)
-
#endif
/* EOF */
Modified: branches/pingus-0.7.3/src/screen/gui_screen.hpp
===================================================================
--- branches/pingus-0.7.3/src/screen/gui_screen.hpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/screen/gui_screen.hpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -40,8 +40,8 @@
virtual ~GUIScreen ();
/** Draw this screen */
- virtual void draw_foreground (DrawingContext& gc) { UNUSED_ARG(gc); }
- virtual void draw_background (DrawingContext& gc) { UNUSED_ARG(gc); }
+ virtual void draw_foreground (DrawingContext& gc) { }
+ virtual void draw_background (DrawingContext& gc) { }
virtual bool draw(DrawingContext& gc);
/** Pass a game delta to the screen */
Modified: branches/pingus-0.7.3/src/screen/input_debug_screen.cpp
===================================================================
--- branches/pingus-0.7.3/src/screen/input_debug_screen.cpp 2010-03-18
11:38:24 UTC (rev 4106)
+++ branches/pingus-0.7.3/src/screen/input_debug_screen.cpp 2010-03-18
11:52:00 UTC (rev 4107)
@@ -40,8 +40,7 @@
{
std::cout << "InputDebugScreen::draw ()" << std::endl;
CL_System::sleep(100);
- UNUSED_ARG(gc);
- return true;
+ return true;
}
/** Pass a delta to the screen */
Modified: branches/pingus-0.7.3/src/tinygettext/po_file_reader.cpp
===================================================================
--- branches/pingus-0.7.3/src/tinygettext/po_file_reader.cpp 2010-03-18
11:38:24 UTC (rev 4106)
+++ branches/pingus-0.7.3/src/tinygettext/po_file_reader.cpp 2010-03-18
11:52:00 UTC (rev 4107)
@@ -24,6 +24,7 @@
#include <sstream>
#include <stdexcept>
#include <string.h>
+#include <stdio.h>
#include "iconv.hpp"
#include "po_file_reader.hpp"
Modified: branches/pingus-0.7.3/src/worldmap/level_dot.cpp
===================================================================
--- branches/pingus-0.7.3/src/worldmap/level_dot.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/worldmap/level_dot.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -95,8 +95,7 @@
void
LevelDot::update(float delta)
{
- UNUSED_ARG(delta);
-}
+ }
void
LevelDot::on_click()
Modified: branches/pingus-0.7.3/src/worldmap/manager.cpp
===================================================================
--- branches/pingus-0.7.3/src/worldmap/manager.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/worldmap/manager.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -284,8 +284,7 @@
void
WorldMapManager::update (float delta)
{
- UNUSED_ARG(delta);
-
+
// Exit the word
if (exit_worldmap)
ScreenManager::instance ()->pop_screen ();
@@ -353,8 +352,7 @@
WorldMapComponent::update (float delta)
{
WorldMapManager::instance()->worldmap->update(delta);
- UNUSED_ARG(delta);
-}
+ }
void
WorldMapManager::draw_foreground(DrawingContext& gc)
Modified: branches/pingus-0.7.3/src/worldmap/path_drawable.cpp
===================================================================
--- branches/pingus-0.7.3/src/worldmap/path_drawable.cpp 2010-03-18
11:38:24 UTC (rev 4106)
+++ branches/pingus-0.7.3/src/worldmap/path_drawable.cpp 2010-03-18
11:52:00 UTC (rev 4107)
@@ -46,8 +46,7 @@
void
PathDrawable::update (float delta)
{
- UNUSED_ARG(delta);
-}
+ }
} // namespace WorldMapNS
Modified: branches/pingus-0.7.3/src/worldmap/surface_drawable.cpp
===================================================================
--- branches/pingus-0.7.3/src/worldmap/surface_drawable.cpp 2010-03-18
11:38:24 UTC (rev 4106)
+++ branches/pingus-0.7.3/src/worldmap/surface_drawable.cpp 2010-03-18
11:52:00 UTC (rev 4107)
@@ -45,8 +45,7 @@
void
SurfaceDrawable::update(float delta)
{
- UNUSED_ARG(delta);
-}
+ }
void
SurfaceDrawable::draw(DrawingContext& gc)
Modified: branches/pingus-0.7.3/src/worldmap/world_dot.hpp
===================================================================
--- branches/pingus-0.7.3/src/worldmap/world_dot.hpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/worldmap/world_dot.hpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -35,9 +35,9 @@
WorldDot(FileReader reader);
/** Draw stuff that should be displayed if the mouse is over the dot */
- virtual void draw_hover(DrawingContext& gc) { UNUSED_ARG(gc); }
- virtual void draw(DrawingContext& gc) { UNUSED_ARG(gc); }
- virtual void update(float delta) { UNUSED_ARG(delta); }
+ virtual void draw_hover(DrawingContext& gc) { }
+ virtual void draw(DrawingContext& gc) { }
+ virtual void update(float delta) { }
Vector3f get_pos() { return pos; }
Modified: branches/pingus-0.7.3/src/worldmap/worldmap.cpp
===================================================================
--- branches/pingus-0.7.3/src/worldmap/worldmap.cpp 2010-03-18 11:38:24 UTC
(rev 4106)
+++ branches/pingus-0.7.3/src/worldmap/worldmap.cpp 2010-03-18 11:52:00 UTC
(rev 4107)
@@ -218,14 +218,12 @@
void
WorldMap::remove_drawable(Drawable* drawable)
{
- UNUSED_ARG(drawable);
-}
+ }
void
WorldMap::set_pingus(NodeId id)
{
- UNUSED_ARG(id);
-}
+ }
void
WorldMap::on_pointer_move(int x, int y)
Modified: branches/pingus-0.7.3/src/worldobj.cpp
===================================================================
--- branches/pingus-0.7.3/src/worldobj.cpp 2010-03-18 11:38:24 UTC (rev
4106)
+++ branches/pingus-0.7.3/src/worldobj.cpp 2010-03-18 11:52:00 UTC (rev
4107)
@@ -70,8 +70,7 @@
void
WorldObj::draw_smallmap(SmallMap* smallmap)
{
- UNUSED_ARG(smallmap);
-}
+ }
void
WorldObj::draw (SceneContext& gc)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4107 - in branches/pingus-0.7.3/src: . components editor gui input screen tinygettext worldmap,
grumbel at BerliOS <=