[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.15,1.16 ac
|
From: |
torangan |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.15,1.16 action_window.hxx,1.8,1.9 editor.cxx,1.50,1.51 editor.hxx,1.24,1.25 editor_event.cxx,1.56,1.57 editor_event.hxx,1.17,1.18 editor_help_screen.cxx,1.9,1.10 editor_help_screen.hxx,1.5,1.6 editor_view.cxx,1.7,1.8 editor_view.hxx,1.7,1.8 editorobj.cxx,1.6,1.7 editorobj.hxx,1.18,1.19 editorobj_group.cxx,1.9,1.10 editorobj_group.hxx,1.15,1.16 editorobj_mgr.hxx,1.1,1.2 generic_property_frame.cxx,1.5,1.6 generic_property_frame.hxx,1.2,1.3level_property_window.cxx,1.12,1.13 level_property_window.hxx,1.10,1.11 level_resizer.cxx,1.4,1.5 level_resizer.hxx,1.3,1.4 object_manager.cxx,1.47,1.48 object_manager.hxx,1.27,1.28 object_selector.cxx,1.39,1.40 object_selector.hxx,1.14,1.15 object_selector_window.hxx,1.2,1.3 panel.cxx,1.6,1.7 panel.hxx,1.8,1.9 panel_icons.cxx,1.8,1.9 panel_icons.hxx,1.8,1.9 property_frame.hxx,1.8,1.9 property_window.cxx,1.15,1.16 property_window.hxx,1.10,1.11 rect_editorobj.cxx,1.8,1.9 rect_editorobj.hxx,1.7,1.8 scroll_map.cxx,1.6,1.7 scroll_map.hxx,1.6,1.7 selection.cxx,1.18,1.19 selection.hxx,1.14,1.15 sprite_editorobj.cxx,1.9,1.10 sprite_editorobj.hxx,1.9,1.10 start_pos.cxx,1.7,1.8 start_pos.hxx,1.10,1.11 status_line.cxx,1.9,1.10 status_line.hxx,1.10,1.11 string_reader.cxx,1.7,1.8 string_reader.hxx,1.6,1.7 surface_selector.cxx,1.7,1.8 surface_selector.hxx,1.7,1.8 thumb_cache.cxx,1.12,1.13 thumb_cache.hxx,1.8,1.9 weather_obj.cxx,1.11,1.12 weather_obj.hxx,1.11,1.12 |
|
Date: |
Sat, 19 Apr 2003 10:27:32 -0000 |
Update of /var/lib/cvs/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv20737/editor
Modified Files:
action_window.cxx action_window.hxx editor.cxx editor.hxx
editor_event.cxx editor_event.hxx editor_help_screen.cxx
editor_help_screen.hxx editor_view.cxx editor_view.hxx
editorobj.cxx editorobj.hxx editorobj_group.cxx
editorobj_group.hxx editorobj_mgr.hxx
generic_property_frame.cxx generic_property_frame.hxx
level_property_window.cxx level_property_window.hxx
level_resizer.cxx level_resizer.hxx object_manager.cxx
object_manager.hxx object_selector.cxx object_selector.hxx
object_selector_window.hxx panel.cxx panel.hxx panel_icons.cxx
panel_icons.hxx property_frame.hxx property_window.cxx
property_window.hxx rect_editorobj.cxx rect_editorobj.hxx
scroll_map.cxx scroll_map.hxx selection.cxx selection.hxx
sprite_editorobj.cxx sprite_editorobj.hxx start_pos.cxx
start_pos.hxx status_line.cxx status_line.hxx
string_reader.cxx string_reader.hxx surface_selector.cxx
surface_selector.hxx thumb_cache.cxx thumb_cache.hxx
weather_obj.cxx weather_obj.hxx
Log Message:
removed trailing whitespace
Index: action_window.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/action_window.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- action_window.cxx 18 Apr 2003 17:08:56 -0000 1.15
+++ action_window.cxx 19 Apr 2003 10:23:18 -0000 1.16
@@ -48,7 +48,7 @@
{
window = new CL_Window (CL_Rect(0, 0,
200, (actions->size() * 20) + 80), "Pingus
Actions", parent);
-
+
//window = new CL_Frame (CL_Rect (0, 0, 200, (actions->size() * 20) + 80),
parent);
//window->enable_fill (true);
@@ -68,7 +68,7 @@
ok_button_slot = ok_button->sig_clicked ().connect (this,
&ActionWindow::ok_clicked);
cancel_button_slot = cancel_button->sig_clicked ().connect (this,
&ActionWindow::cancel_clicked);
-
+
hide ();
//window->run ();
window->set_position(100, 100);
@@ -89,7 +89,7 @@
window->show (false);
}
-void
+void
ActionWindow::ok_clicked ()
{
//std::cout << "OK Clicked" << std::endl;
@@ -146,7 +146,7 @@
{
//std::cout << "Writing data" << std::endl;
- for (unsigned int i = 0; i < default_actions.size(); ++i)
+ for (unsigned int i = 0; i < default_actions.size(); ++i)
{
if (checkboxes[i]->is_checked ())
{
@@ -157,12 +157,12 @@
ActionData data;
from_string(inputs[i]->get_text (), data.number_of);
data.name = default_actions[i].name;
-
+
actions->push_back (data);
}
else
{
- from_string(inputs[i]->get_text (), act->number_of);
+ from_string(inputs[i]->get_text (), act->number_of);
}
}
else
Index: action_window.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/action_window.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- action_window.hxx 27 Sep 2002 11:26:45 -0000 1.8
+++ action_window.hxx 19 Apr 2003 10:23:18 -0000 1.9
@@ -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.
@@ -47,7 +47,7 @@
CL_Slot ok_button_slot;
CL_Slot cancel_button_slot;
public:
- ActionWindow (CL_Component* parent, std::vector<ActionData>*);
+ ActionWindow (CL_Component* parent, std::vector<ActionData>*);
void ok_clicked ();
void cancel_clicked ();
@@ -57,7 +57,7 @@
private:
void read_data ();
void write_data ();
-
+
ActionWindow (const ActionWindow&);
ActionWindow& operator= (const ActionWindow&);
};
Index: editor.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- editor.cxx 15 Apr 2003 19:06:50 -0000 1.50
+++ editor.cxx 19 Apr 2003 10:23:18 -0000 1.51
@@ -56,11 +56,11 @@
Editor*
Editor::instance ()
-{
+{
if ( ! instance_)
instance_ = new Editor ();
-
- return instance_;
+
+ return instance_;
}
void
@@ -93,7 +93,7 @@
// FIXME: Should use PingusResource, Memleak
CL_ResourceManager* gui_resources = new
CL_ResourceManager(path_manager.complete("data/gui.scr"), false);
-
+
style_manager = new CL_StyleManager_Default (gui_resources);
gui = new CL_GUIManager (style_manager);
@@ -104,14 +104,14 @@
view = new EditorView (0, 0, CL_Display::get_width (),
CL_Display::get_height (), 0, 0);
event->set_editor(this);
-
+
font = PingusResource::load_font("Fonts/courier_small", "fonts");
panel->init();
status_line->set_current_objs(&selection->get_objects());
panel->set_editor(this);
scroll_map->editor_event = event;
- //std::cout << "Editor: registering event handler" << event << "... " <<
std::flush;
+ //std::cout << "Editor: registering event handler" << event << "... " <<
std::flush;
on_button_press_slot = CL_Input::sig_button_press ().connect(event,
&EditorEvent::on_button_press);
on_button_release_slot = CL_Input::sig_button_release ().connect(event,
&EditorEvent::on_button_release);
}
@@ -167,7 +167,7 @@
property_window->update_frame(0);
//std::cout << "EditorEvent::editor_show_object_properties (): error:
multiple objects selected" << std::endl;
}
- }
+ }
object_manager->update(delta.get_time());
@@ -193,7 +193,7 @@
status_line->draw(view);
scroll_map->draw();
-
+
if (show_help_screen)
{
help_screen.draw ();
@@ -228,16 +228,16 @@
(mouse_y - CL_Mouse::get_y()) / 5));
// object_manager->x_offset += (mouse_x - CL_Mouse::get_x()) / 5;
// object_manager->y_offset += (mouse_y - CL_Mouse::get_y()) / 5;
-
+
/*cout << "ObjectManager: "
- << "X: " << object_manager.x_offset
+ << "X: " << object_manager.x_offset
<< " Y: " << object_manager.y_offset << std::endl;
*/
draw();
Display::flip_display(true);
}
}
-
+
if (verbose) std::cout << "finished" << std::endl;
}
@@ -245,25 +245,25 @@
Editor::read_string (const std::string & prefix, const std::string &
default_str)
{
event->disable();
-
+
std::string str;
- if (default_str.empty())
+ if (default_str.empty())
{
- if (last_level.empty())
+ if (last_level.empty())
{
str = System::get_statdir() + "levels/";
- }
- else
+ }
+ else
{
str = last_level;
}
}
- else
+ else
{
str = default_str;
}
-
+
CL_Display::clear_display();
font->print_left(20, 20, prefix.c_str());
font->print_left(20, 40, str.c_str());
@@ -276,14 +276,14 @@
CL_InputBuffer* keys = new CL_InputBuffer;
bool finished = false;
- while (!finished)
- {
+ while (!finished)
+ {
CL_System::keep_alive();
-
- if (keys->peek_key().state != CL_Key::NoKey)
+
+ if (keys->peek_key().state != CL_Key::NoKey)
{
key = keys->get_key();
-
+
if (key.state == CL_Key::Pressed)
{
switch (key.id)
@@ -292,22 +292,22 @@
finished = true;
std::cout << "--- Enter pressed" << std::endl;
break;
-
+
case CL_KEY_ESCAPE:
str = "";
finished = true;
break;
-
+
case CL_KEY_DELETE:
case CL_KEY_BACKSPACE:
if (!str.empty())
- str = str.substr(0, str.size() - 1);
+ str = str.substr(0, str.size() - 1);
break;
-
+
case CL_KEY_TAB:
std::cout << "Tab completion not implemented" << std::endl;
break;
-
+
default:
if (key.ascii > 0)
str += key.ascii;
@@ -344,14 +344,14 @@
backup_id = 0;
StatManager::instance()->set_int("next-backup-id", backup_id + 1);
-
+
std::string filename = System::get_backupdir () + "pingus-backup-" +
to_string(backup_id) + ".xml";
std::cout << "Editor: saving backup level to: " << filename << std::endl;
object_manager->save_level_xml(filename.c_str());
return filename;
}
-void
+void
Editor::zoom_mode ()
{
CL_Rect rect;
@@ -360,11 +360,11 @@
tool = ZOOM_TOOL;
CL_Surface mouse_cursor = PingusResource::load_surface("editor/region-zoom",
"core");
-
+
while (true)
{
- CL_System::keep_alive();
-
+ CL_System::keep_alive();
+
if (CL_Mouse::left_pressed () && !mouse_down)
{
mouse_down = true;
@@ -382,8 +382,8 @@
{
rect.x2 = CL_Mouse::get_x ();
rect.y2 = CL_Mouse::get_y ();
-
- CL_Display::draw_rect (rect.x1, rect.y1, rect.x2, rect.y2,
+
+ CL_Display::draw_rect (rect.x1, rect.y1, rect.x2, rect.y2,
1.0, 1.0, 0.0, 1.0);
}
@@ -391,7 +391,7 @@
Display::flip_display(true);
}
-
+
view->zoom_to (rect);
tool = SELECTOR_TOOL;
}
@@ -409,23 +409,23 @@
end_pos = Vector(CL_Mouse::get_x(),
CL_Mouse::get_y ());
-
+
// Draw the screen
CL_Display::clear_display();
object_manager->draw(view);
selection->draw (view);
-
+
Display::draw_rect((int) start_pos.x, (int)start_pos.y, (int)end_pos.x,
(int)end_pos.y,
0.0f, 1.0f, 0.0f, 1.0f);
panel->draw();
status_line->draw(view);
Display::flip_display(true);
}
-
+
start_pos = view->screen_to_world (start_pos);
end_pos = view->screen_to_world (end_pos);
- selection->select_rect(start_pos.x, start_pos.y,
+ selection->select_rect(start_pos.x, start_pos.y,
end_pos.x, end_pos.y);
}
@@ -468,7 +468,7 @@
move_y = -move_speed;
else if (CL_Keyboard::get_keycode(CL_KEY_DOWN))
move_y = move_speed;
-
+
selection->move(move_x, move_y);
}
}
@@ -483,7 +483,7 @@
selection->drag ();
Vector old_pos (view->screen_to_world(Vector(CL_Mouse::get_x(),
CL_Mouse::get_y())));
- while (CL_Mouse::left_pressed())
+ while (CL_Mouse::left_pressed())
{
Vector new_pos (view->screen_to_world(Vector(CL_Mouse::get_x(),
CL_Mouse::get_y())));
@@ -492,7 +492,7 @@
selection->move(new_pos.x - old_pos.x, new_pos.y - old_pos.y);
old_pos = new_pos;
-
+
draw();
Display::flip_display (true);
CL_System::keep_alive();
@@ -506,7 +506,7 @@
show_help_screen = !show_help_screen;
}
-void
+void
Editor::load_level (const std::string& str)
{
std::cout << "Editor::load_level(" << str << std::endl;
@@ -527,14 +527,14 @@
std::string levelfile;
levelfile = read_string("Input level to load (without the .plf ending!):");
- if (!levelfile.empty())
+ if (!levelfile.empty())
{
- try
+ try
{
- if (exist(levelfile + ".plf"))
+ if (exist(levelfile + ".plf"))
{
last_level = levelfile;
-
+
edit();
}
else
@@ -542,7 +542,7 @@
std::cout << "Creating new level, removing the current one..." <<
std::endl;
current_objs.erase(current_objs.begin(), current_objs.end());
editor_objs.erase(editor_objs.begin(), editor_objs.end());
-
+
width = 1280;
height = 640;
start_x_pos = 640;
@@ -555,8 +555,8 @@
edit();
}
}
-
- catch (PingusError err)
+
+ catch (PingusError err)
{
PingusMessageBox(" PingusError: " + err.message);
interactive_load();
Index: editor.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor.hxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- editor.hxx 19 Feb 2003 09:50:36 -0000 1.24
+++ editor.hxx 19 Apr 2003 10:23:18 -0000 1.25
@@ -54,7 +54,7 @@
CL_Slot on_button_press_slot;
CL_Slot on_button_release_slot;
-
+
int event_handler_ref_counter;
CL_Font* font;
@@ -72,10 +72,10 @@
ScrollMap* scroll_map;
ObjectManager* object_manager;
Selection* selection;
- EditorView* view;
+ EditorView* view;
StatusLine* status_line;
ObjectSelector* object_selector;
-
+
// GUI Stuff
CL_StyleManager_Default* style_manager;
CL_GUIManager* gui;
@@ -94,7 +94,7 @@
Editor ();
public:
virtual ~Editor ();
-
+
static Editor* instance ();
static void init();
static void deinit();
@@ -131,7 +131,7 @@
void on_shutdown ();
EditorNS::PropertyWindow* get_property_window () { return property_window; }
-
+
private:
Editor (const Editor&);
Editor& operator= (const Editor&);
Index: editor_event.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- editor_event.cxx 1 Apr 2003 15:13:33 -0000 1.56
+++ editor_event.cxx 19 Apr 2003 10:23:18 -0000 1.57
@@ -72,7 +72,7 @@
EditorEvent::~EditorEvent()
{
-
+
}
void
@@ -116,7 +116,7 @@
{
switch (key.id)
{
- case CL_KEY_R:
+ case CL_KEY_R:
if (CL_Keyboard::get_keycode(CL_KEY_RSHIFT)
|| CL_Keyboard::get_keycode(CL_KEY_LSHIFT))
{ // rotate 90 counterclockwise
@@ -140,14 +140,14 @@
editor_import_prefab ();
break;
- case CL_KEY_X: // export prefab
+ case CL_KEY_X: // export prefab
editor_export_prefab_from_selection ();
break;
case CL_KEY_F3:
editor_toggle_background_color();
break;
-
+
// Start the created level and come back if done.
case CL_KEY_F4:
editor_start_current_level();
@@ -166,30 +166,30 @@
if (verbose) std::cout << "Setting checkpoint: " <<
editor->checkpoint << std::endl;
object_manager->save_level(editor->checkpoint);*/
break;
-
+
// Restore a previously created checkpoint.
case CL_KEY_F8:
- /*
+ /*
editor->save_tmp_level();
- if (!editor->checkpoint.empty())
+ if (!editor->checkpoint.empty())
{
if (verbose) std::cout << "Restoring checkpoint: " <<
editor->checkpoint << std::endl;
selection->clear ();
object_manager->load_level(editor->checkpoint);
- }
- else
+ }
+ else
{
if (verbose) std::cout << "No checkpoint set, no restoring done.
" << std::endl;
}*/
break;
-
+
// Insert a new object, present the ObjectsSelector to select
- // one.
+ // one.
case CL_KEY_INSERT:
editor_insert_new_object();
// FIXME: GUI stuff new ObjectSelectorWindow(editor->gui);
break;
-
+
// Load a level from file.
case CL_KEY_F5:
editor_load_level();
@@ -204,25 +204,25 @@
case CL_KEY_A:
editor_mark_all_objects();
break;
-
+
/* case CL_KEY_F11:
- CL_Display::set_videomode(screen_width, screen_height, 16,
- fullscreen_enabled,
+ CL_Display::set_videomode(screen_width, screen_height, 16,
+ fullscreen_enabled,
true); // allow resize
break;
*/
case CL_KEY_F12:
// FIXME: disable cause it gives a segfault
- //CL_Display::set_videomode(900, 700, 16,
- //fullscreen_enabled,
+ //CL_Display::set_videomode(900, 700, 16,
+ //fullscreen_enabled,
// true); // allow resize
break;
-
+
// Delete all objects of the curret selection.
case CL_KEY_DELETE:
editor_delete_selected_objects();
break;
-
+
// Form the current selection into a group
case CL_KEY_G:
if (CL_Keyboard::get_keycode(CL_KEY_RSHIFT)
@@ -245,8 +245,8 @@
// Lower all object in the current selection
case CL_KEY_PAGEDOWN:
selection->lower();
-
- if (CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
+
+ if (CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
{
selection->move(Vector(0, 0, -50));
}
@@ -255,15 +255,15 @@
selection->move(Vector(0, 0, -1));
}
break;
-
+
// Raise all objects in the current selection.
case CL_KEY_PAGEUP:
selection->raise();
- if (CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
+ if (CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
{
selection->move(Vector(0, 0, 50));
}
- else if (CL_Keyboard::get_keycode(CL_KEY_RCTRL))
+ else if (CL_Keyboard::get_keycode(CL_KEY_RCTRL))
{
selection->move(Vector(0, 0, 1));
}
@@ -286,8 +286,8 @@
snprintf(str, 16, "%d", object_manager->width);
tmp_str = editor->read_string("Input Width: ", str);
-
- if (sscanf(tmp_str.c_str(), "%d", &twidth) == 1)
+
+ if (sscanf(tmp_str.c_str(), "%d", &twidth) == 1)
{
object_manager->width = twidth;
}
@@ -295,7 +295,7 @@
snprintf(str, 16, "%d", object_manager->height);
tmp_str = editor->read_string("Input Height: ", str);
- if (sscanf(tmp_str.c_str(), "%d", &theight) == 1)
+ if (sscanf(tmp_str.c_str(), "%d", &theight) == 1)
{
object_manager->height = theight;
}
@@ -315,13 +315,13 @@
break;
case CL_KEY_ENTER:
- editor->view->set_zoom (1.0);
+ editor->view->set_zoom (1.0);
break;
case CL_KEY_D:
editor_duplicate_current_selection();
break;
-
+
default:
if (verbose)
std::cout << "EditorEvent: Unknown key pressed: id=" << key.id << "
ascii=" << key.ascii << std::endl;
@@ -332,7 +332,7 @@
/*std::cout << "Mouse: (" << CL_Mouse::get_x () << ", " <<
CL_Mouse::get_y () << ") "
<< "World: " << editor->view->screen_to_world
(Vector(CL_Mouse::get_x (), CL_Mouse::get_y ()))
<< std::endl;*/
-
+
switch (key.id)
{
case CL_MOUSE_LEFTBUTTON:
@@ -355,7 +355,7 @@
{
if (verbose) std::cout << "Warning: Unknown input device" << std::endl;
}
-
+
// Redraw the screen, since something may have changed
editor->draw();
}
@@ -379,7 +379,7 @@
else
{
}
-
+
return;
}
@@ -391,7 +391,7 @@
EditorObjGroup* group =
dynamic_cast<EditorObjGroup*>(selection->get_current_obj());
if (group)
- {
+ {
std::vector<EditorObj*>* objs = group->get_objs();
selection->clear();
@@ -440,7 +440,7 @@
for (std::vector<EditorObj*>::const_iterator i =
selection->get_objects().begin();
i != selection->get_objects().end();
++i)
- {
+ {
if (*j == *i)
{
group->add (*i);
@@ -468,10 +468,10 @@
EditorEvent::editor_mark_all_objects()
{
selection->clear();
-
- for(ObjectManager::EditorObjIter i = object_manager->editor_objs.begin();
- i != object_manager->editor_objs.end();
- ++i)
+
+ for(ObjectManager::EditorObjIter i = object_manager->editor_objs.begin();
+ i != object_manager->editor_objs.end();
+ ++i)
{
if (dynamic_cast<LevelResizer*>(*i) == 0)
selection->add(*i);
@@ -481,7 +481,7 @@
void
EditorEvent::editor_toggle_background_color()
{
- std::vector<Color>::iterator i =
+ std::vector<Color>::iterator i =
std::find(background_colors.begin (), background_colors.end (),
object_manager->bg);
if (i == background_colors.end ())
@@ -500,7 +500,7 @@
void
EditorEvent::editor_delete_selected_objects()
{
- editor->save_tmp_level ();
+ editor->save_tmp_level ();
object_manager->erase (selection->get_objects());
selection->clear();
}
@@ -510,24 +510,24 @@
{
loading_screen.draw();
- try
+ try
{
std::string levelfile = editor->save_tmp_level();
// FIXME: Insert here something that checks if a level needs a reload
ScreenManager::instance()->push_screen
(new PingusGameSession (PLFResMgr::load_plf_from_filename(levelfile),
false), true);
}
- catch(const PingusError& err)
+ catch(const PingusError& err)
{
std::cout << "Editor: Error caught from Pingus: " << err.get_message ()
<< std::endl;
- }
- catch (const CL_Error& err)
+ }
+ catch (const CL_Error& err)
{
std::cout << "Editor: Error caught from ClanLib: " << err.message <<
std::endl;
}
}
-void
+void
EditorEvent::editor_load_level()
{
std::string str;
@@ -543,7 +543,7 @@
for (System::Directory::iterator i = dir.begin(); i != dir.end(); ++i)
{
//std::cout << "dirs: " << System::get_statdir() + "levels/" + i->name
<< std::endl;
-
+
temp_str = System::get_statdir() + "levels/" + i->name;
strings.push_back(temp_str);
@@ -555,7 +555,7 @@
str = reader.read_string();
enable();
- if (!str.empty())
+ if (!str.empty())
{
try {
selection->clear ();
@@ -597,10 +597,10 @@
str = reader.read_string();
enable();
- if (!str.empty())
+ if (!str.empty())
{
if (str.substr(str.size() - 4) == ".xml")
- object_manager->save_level_xml(str);
+ object_manager->save_level_xml(str);
else
object_manager->save_level_xml(str + ".xml");
@@ -612,15 +612,15 @@
EditorEvent::editor_duplicate_current_selection()
{
std::vector<EditorObj*> new_objs;
-
- for (std::vector<EditorObj*>::const_iterator i =
selection->get_objects().begin();
+
+ for (std::vector<EditorObj*>::const_iterator i =
selection->get_objects().begin();
i != selection->get_objects().end();
++i)
{
- /*ObjectManager::EditorObjIter iter =
std::find(object_manager->editor_objs.begin(),
-
object_manager->editor_objs.end(),
+ /*ObjectManager::EditorObjIter iter =
std::find(object_manager->editor_objs.begin(),
+
object_manager->editor_objs.end(),
*i);*/
-
+
EditorObj* obj = (*i)->duplicate();
if (obj)
{
@@ -643,7 +643,7 @@
{
editor->save_tmp_level();
- try
+ try
{
disable();
//std::cout << "Object selector on" <<std::endl;
@@ -653,7 +653,7 @@
//std::cout << "Object selector off" << std::endl;
enable();
}
-
+
catch (CL_Error err) {
std::cout << "Editor: Error caught from ClanLib: " << err.message <<
std::endl;
enable();
@@ -667,7 +667,7 @@
object_manager->new_level();
}
-void
+void
EditorEvent::editor_exit()
{
editor->save_tmp_level();
@@ -680,10 +680,10 @@
if (editor->tool != Editor::SELECTOR_TOOL)
return;
- EditorObj* obj
- = object_manager->find_object(editor->view->screen_to_world
(Vector(CL_Mouse::get_x(),
+ EditorObj* obj
+ = object_manager->find_object(editor->view->screen_to_world
(Vector(CL_Mouse::get_x(),
CL_Mouse::get_y())));
-
+
int x = CL_Mouse::get_x();
int y = CL_Mouse::get_y();
bool move_selection = false;
@@ -707,7 +707,7 @@
if (!CL_Keyboard::get_keycode(CL_KEY_LSHIFT)
&& !CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
selection->clear();
-
+
if (selection->has_object(obj))
selection->remove(obj);
else
@@ -720,7 +720,7 @@
}
}
-void
+void
EditorEvent::editor_display_help()
{
/* CL_Display::clear_display();
@@ -735,22 +735,22 @@
void
EditorEvent::editor_decrease_count ()
{
-
+
}
-void
+void
EditorEvent::editor_zoom_in ()
{
editor->view->set_zoom (editor->view->get_zoom () * 1.4f);
}
-void
+void
EditorEvent::editor_zoom_out ()
{
editor->view->set_zoom (editor->view->get_zoom () / 1.4f);
}
-void
+void
EditorEvent::zoom_mode ()
{
editor->zoom_mode ();
@@ -760,12 +760,12 @@
EditorEvent::editor_export_prefab_from_selection ()
{
std::cout << "EditorEvent:editor_export_object_group_from_selection ():
/tmp/metaobj.xml" << std::endl;
-
+
std::vector<EditorObj*> temp;
for (std::vector<EditorObj*>::const_iterator it =
selection->get_objects().begin();
it != selection->get_objects().end(); ++it)
temp.push_back(*it);
-
+
EditorObjGroup group (temp);
std::ofstream xml ("/tmp/metaobj.xml");
xml << "<pingus-prefab>\n"
@@ -782,7 +782,7 @@
editor->object_manager->add_prefab_from_file ("/tmp/metaobj.xml");
}
-void
+void
EditorEvent::editor_horizontal_flip_current_selection()
{
selection->horizontal_flip ();
@@ -827,7 +827,7 @@
if (editor->level_property_window->is_visible ())
editor->level_property_window->show (false);
else
- editor->level_property_window->show (true);
+ editor->level_property_window->show (true);
}
bool
@@ -835,7 +835,7 @@
{
return
is_enabled
- &&
+ &&
(editor->get_gui_manager ()->get_focus () == editor->get_gui_manager ());
}
Index: editor_event.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_event.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- editor_event.hxx 27 Sep 2002 11:26:45 -0000 1.17
+++ editor_event.hxx 19 Apr 2003 10:23:18 -0000 1.18
@@ -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.
@@ -48,7 +48,7 @@
Editor* editor;
ObjectManager* object_manager;
Selection* selection;
-
+
virtual void on_button_press(CL_InputDevice *device, const CL_Key &key);
virtual void on_button_release(CL_InputDevice *device, const CL_Key &key);
@@ -79,14 +79,14 @@
void editor_new_level();
void editor_insert_new_object();
void editor_display_help();
-
+
// Export the current selection to a meta-obj
void editor_export_prefab_from_selection ();
void editor_import_prefab ();
/** Display the configuration window for the actions */
void editor_show_actions_window ();
-
+
/** Display the property dialog for the current object */
void editor_show_object_properties ();
@@ -108,7 +108,7 @@
private:
bool accept_input ();
-
+
EditorEvent (const EditorEvent&);
EditorEvent& operator= (const EditorEvent&);
};
Index: editor_help_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_help_screen.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- editor_help_screen.cxx 15 Apr 2003 10:33:15 -0000 1.9
+++ editor_help_screen.cxx 19 Apr 2003 10:23:18 -0000 1.10
@@ -27,7 +27,7 @@
: font (PingusResource::load_font("Fonts/pingus_small", "fonts")),
large_font (PingusResource::load_font("Fonts/pingus", "fonts"))
{
-
+
}
void
@@ -77,7 +77,7 @@
font->print_left (x_pos, y_pos + 340, _("Ctrl PageDown - decrease objects
z-pos by 1"));
//font->print_left (x_pos, y_pos + 320, _(""));
//font->print_left (x_pos, y_pos + 340, _(""));
-
+
x_pos = 64;
y_pos = 500;
font->print_left (x_pos, y_pos + 0, _("Naming Convention:
<LEVELNAME><NUMBER>-<CREATOR>.xml"));
Index: editor_help_screen.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_help_screen.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- editor_help_screen.hxx 27 Sep 2002 11:26:45 -0000 1.5
+++ editor_help_screen.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.
@@ -33,7 +33,7 @@
EditorHelpScreen ();
void draw ();
void update (float delta);
-
+
private:
EditorHelpScreen (const EditorHelpScreen&);
EditorHelpScreen& operator= (const EditorHelpScreen&);
Index: editor_view.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_view.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- editor_view.cxx 30 Mar 2003 13:12:35 -0000 1.7
+++ editor_view.cxx 19 Apr 2003 10:23:18 -0000 1.8
@@ -26,13 +26,13 @@
namespace EditorNS {
-EditorView::EditorView (int x1_, int y1_, int x2_, int y2_,
+EditorView::EditorView (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::cout << "View: " << x1 << ", " << y1 << ", " << x2 << ", " << y2
//<< std::endl;
UNUSED_ARG(x_offset);
UNUSED_ARG(y_offset);
@@ -61,7 +61,7 @@
//std::cout << "Zoom: " << offset.z << std::endl;
}
-void
+void
EditorView::zoom_to (const CL_Rect & arg_rect)
{
CL_Rect rect;
@@ -70,7 +70,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));
@@ -85,7 +85,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));
@@ -96,7 +96,7 @@
}
}
-int
+int
EditorView::get_width ()
{
return x2 - x1;
@@ -108,7 +108,7 @@
return y2 - y1;
}
-void
+void
EditorView::move (const Vector & delta)
{
offset += delta;
@@ -126,42 +126,42 @@
return ((pos + offset) * offset.z) + center;
}
-float
+float
EditorView::get_x_offset ()
{
return offset.x;
}
-float
+float
EditorView::get_y_offset ()
{
return offset.y;
}
-void
+void
EditorView::draw (Sprite& sprite, const Vector& pos)
{
CL_Surface sur (sprite.get_surface ());
- draw (sur,
+ draw (sur,
(int) pos.x + sprite.get_x_align (),
(int) pos.y + sprite.get_y_align ());
}
-void
+void
EditorView::draw (Sprite& sprite, const Vector& pos, int frame)
{
CL_Surface sur (sprite.get_surface ());
- draw (sur,
+ draw (sur,
(int) pos.x + sprite.get_x_align (),
- (int) pos.y + sprite.get_y_align (),
+ (int) pos.y + sprite.get_y_align (),
frame);
}
-void
+void
EditorView::draw (CL_Surface& sur, const Vector& pos)
{
if (offset.z == 1.0)
- {
+ {
sur.put_screen (int(pos.x + get_x_offset () + center.x),
int(pos.y + get_y_offset () + center.y));
}
@@ -175,13 +175,13 @@
//CL_Display::draw_line (x1, y2, x2, y1, 1.0, 1.0, 0.0);
}
-void
+void
EditorView::draw (CL_Surface& sur, const Vector& pos, int frame)
{
draw (sur, int(pos.x), int(pos.y), frame);
}
-void
+void
EditorView::draw (CL_Surface& sur, int x_pos, int y_pos)
{
if (offset.z == 1.0)
@@ -197,43 +197,43 @@
}
}
-void
+void
EditorView::draw (CL_Surface& sur, int x_pos, int y_pos, int frame)
{
if (offset.z == 1.0)
{
sur.put_screen (int(x_pos + get_x_offset () + center.x),
int(y_pos + get_y_offset () + center.y),
- frame);
+ frame);
}
else
{
sur.put_screen (int((x_pos + get_x_offset ()) * offset.z + center.x),
int((y_pos + get_y_offset ()) * offset.z + center.y),
offset.z, offset.z,
- frame);
+ frame);
}
}
-void
-EditorView::draw (CL_Surface& sur, int x_pos, int y_pos,
+void
+EditorView::draw (CL_Surface& sur, int x_pos, int y_pos,
float size_x, float size_y, int frame)
{
sur.put_screen (int(x_pos + get_x_offset () + center.x),
int(y_pos + get_y_offset () + center.y),
- size_x * offset.z,
- size_y * offset.z, frame);
+ size_x * offset.z,
+ size_y * offset.z, frame);
}
-void
+void
EditorView::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
-EditorView::draw_line (int x1_, int y1_, int x2_, int y2_,
+void
+EditorView::draw_line (int x1_, int y1_, int x2_, int y2_,
float r, float g, float b, float a)
{
CL_Display::draw_line (static_cast<int>((x1_ + get_x_offset()) * offset.z +
center.x),
@@ -243,30 +243,30 @@
r, g, b, a);
}
-void
-EditorView::draw_fillrect (int x1_, int y1_, int x2_, int y2_,
+void
+EditorView::draw_fillrect (int x1_, int y1_, int x2_, int y2_,
float r, float g, float b, float a)
{
CL_Display::fill_rect (static_cast<int>((x1_ + get_x_offset()) * offset.z +
center.x),
- static_cast<int>((y1_ + get_y_offset()) * offset.z +
center.y),
+ static_cast<int>((y1_ + get_y_offset()) * offset.z +
center.y),
static_cast<int>((x2_ + get_x_offset()) * offset.z +
center.x),
static_cast<int>((y2_ + get_y_offset()) * offset.z +
center.y),
r, g, b, a);
}
-void
-EditorView::draw_rect (int x1_, int y1_, int x2_, int y2_,
+void
+EditorView::draw_rect (int x1_, int y1_, int x2_, int y2_,
float r, float g, float b, float a)
{
CL_Display::draw_rect(static_cast<int>((x1_ + get_x_offset()) * offset.z +
center.x),
- static_cast<int>((y1_ + get_y_offset()) * offset.z +
center.y),
+ static_cast<int>((y1_ + get_y_offset()) * offset.z +
center.y),
static_cast<int>((x2_ + get_x_offset()) * offset.z +
center.x),
static_cast<int>((y2_ + get_y_offset()) * offset.z +
center.y),
r, g, b, a);
}
-void
-EditorView::draw_pixel (int /*x_pos*/, int /*y_pos*/,
+void
+EditorView::draw_pixel (int /*x_pos*/, int /*y_pos*/,
float /*r*/, float /*g*/, float /*b*/, float /*a*/)
{
//CL_Display::put_pixel (x1 + get_x_offset (),
@@ -274,7 +274,7 @@
std::cout << "View::draw_pixel () not implemented" << std::endl;
}
-void
+void
EditorView::draw_circle (int x_pos, int y_pos, int radius,
float r, float g, float b, float a)
{
Index: editor_view.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_view.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- editor_view.hxx 28 Sep 2002 11:52:23 -0000 1.7
+++ editor_view.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.
@@ -38,17 +38,17 @@
private:
int x1, y1, x2, y2;
Vector center;
-
+
/** The current view position, x and y component are the current
position in the level in world coordinates and the z componet is
the zoom of the level (1.0 is default)*/
Vector offset;
public:
- EditorView (int x1, int y1, int x2, int y2,
+ EditorView (int x1, int y1, int x2, int y2,
int x_offset = 0, int y_offset = 0);
virtual ~EditorView ();
-
+
Vector get_offset ();
float get_x_offset ();
@@ -78,18 +78,18 @@
void draw (CL_Surface& sur, const Vector& pos, int frame);
void draw (CL_Surface& sur, int x_pos, int y_pos);
void draw (CL_Surface& sur, int x_pos, int y_pos, int frame);
- 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);
void draw_line (const Vector& pos1, const Vector& pos2,
float r, float g, float b, float a = 1.0f);
- 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);
- 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);
- 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);
- 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);
void draw_circle (int x_pos, int y_pos, int radius,
float r, float g, float b, float a = 1.0f);
Index: editorobj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editorobj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- editorobj.cxx 28 Nov 2002 20:09:54 -0000 1.6
+++ editorobj.cxx 19 Apr 2003 10:23:18 -0000 1.7
@@ -29,7 +29,7 @@
{
}
-std::string
+std::string
EditorObj::status_line()
{
return "EditorObj::status_line(): Not implemented";
Index: editorobj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editorobj.hxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- editorobj.hxx 28 Nov 2002 20:09:54 -0000 1.18
+++ editorobj.hxx 19 Apr 2003 10:23:18 -0000 1.19
@@ -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.
@@ -119,7 +119,7 @@
CL_Component* should/must be a CL_Frame so that it can get
embedded in the properties window */
virtual EditorNS::PropertyFrame* get_gui_dialog (EditorNS::Editor* parent)
=0;
-
+
protected:
EditorObj (const EditorObj&) { }
EditorObj& operator= (const EditorObj&) { return *this; }
Index: editorobj_group.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editorobj_group.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- editorobj_group.cxx 5 Mar 2003 22:18:51 -0000 1.9
+++ editorobj_group.cxx 19 Apr 2003 10:23:18 -0000 1.10
@@ -46,7 +46,7 @@
{
}
-void
+void
EditorObjGroup::set_position_offset(const Vector& offset)
{
upper_left_corner += offset;
@@ -68,7 +68,7 @@
}
}
-float
+float
EditorObjGroup::get_z_pos ()
{
/*for(std::vector<boost::shared_ptr<EditorObj> >::iterator i = objs.begin();
@@ -123,7 +123,7 @@
objs.push_back(new_obj);
}
-std::vector<EditorObj*>*
+std::vector<EditorObj*>*
EditorObjGroup::get_objs()
{
return &objs;
@@ -149,7 +149,7 @@
EditorObjGroup::duplicate()
{
EditorObjGroup* editor_obj = new EditorObjGroup();
-
+
for(std::vector<EditorObj*>::iterator i = objs.begin();
i != objs.end();
++i)
@@ -162,7 +162,7 @@
return editor_obj;
}
-bool
+bool
EditorObjGroup::is_over(const Vector& pos)
{
for(std::vector<EditorObj*>::iterator i = objs.begin();
@@ -175,7 +175,7 @@
return false;
}
-bool
+bool
EditorObjGroup::is_in_rect(const CL_Rect& rect)
{
for(std::vector<EditorObj*>::iterator i = objs.begin();
@@ -199,7 +199,7 @@
}
}
-void
+void
EditorObjGroup::horizontal_flip ()
{
for(std::vector<EditorObj*>::iterator i = objs.begin();
@@ -210,7 +210,7 @@
}
}
-void
+void
EditorObjGroup::rotate_90 ()
{
for(std::vector<EditorObj*>::iterator i = objs.begin();
@@ -221,7 +221,7 @@
}
}
-void
+void
EditorObjGroup::rotate_270 ()
{
for(std::vector<EditorObj*>::iterator i = objs.begin();
Index: editorobj_group.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editorobj_group.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- editorobj_group.hxx 5 Mar 2003 22:18:51 -0000 1.15
+++ editorobj_group.hxx 19 Apr 2003 10:23:18 -0000 1.16
@@ -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,13 +25,13 @@
#include "editorobj.hxx"
#include "editorobj_mgr.hxx"
-class EditorObjGroup
+class EditorObjGroup
: public EditorObj,
public EditorNS::EditorObjMgr
{
private:
std::vector<EditorObj*> objs;
-
+
Vector upper_left_corner;
//int width, height;
//bool init;
@@ -45,21 +45,21 @@
void set_position_offset(const Vector& offset);
void draw(EditorNS::EditorView *);
void draw_mark (EditorNS::EditorView * view);
-
+
/** Add an object to the group, the object will get duplicated and
stay untouched */
void add (EditorObj*);
///
std::vector<EditorObj*>* get_objs();
-
+
bool is_over(const Vector &);
bool is_in_rect(const CL_Rect &);
-
+
void write_xml(std::ostream& xml);
EditorObj* duplicate();
unsigned int size () { return objs.size (); }
-
+
void vertical_flip ();
void horizontal_flip ();
void rotate_90 ();
Index: editorobj_mgr.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editorobj_mgr.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- editorobj_mgr.hxx 5 Mar 2003 22:39:56 -0000 1.1
+++ editorobj_mgr.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.
Index: generic_property_frame.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/generic_property_frame.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- generic_property_frame.cxx 18 Apr 2003 12:51:17 -0000 1.5
+++ generic_property_frame.cxx 19 Apr 2003 10:23:18 -0000 1.6
@@ -37,7 +37,7 @@
CL_InputBox* input_box;
int* value;
- IntegerDataBox(CL_Component* parent, int y_pos, const std::string& name,
int* _value)
+ IntegerDataBox(CL_Component* parent, int y_pos, const std::string& name,
int* _value)
: value(_value)
{
label = new CL_Label(CL_Rect(10, y_pos, 90, y_pos + 20), name, parent);
@@ -50,12 +50,12 @@
delete input_box;
}
- void read_data()
+ void read_data()
{
input_box->set_text(to_string(*value));
}
-
- void write_data()
+
+ void write_data()
{
from_string(input_box->get_text(), *value);
}
@@ -68,7 +68,7 @@
CL_InputBox* input_box;
float* value;
- FloatDataBox(CL_Component* parent, int y_pos, const std::string& name,
float* _value)
+ FloatDataBox(CL_Component* parent, int y_pos, const std::string& name,
float* _value)
: value(_value)
{
label = new CL_Label(CL_Rect(10, y_pos, 90, y_pos + 20), name, parent);
@@ -81,12 +81,12 @@
delete input_box;
}
- void read_data()
+ void read_data()
{
input_box->set_text(to_string(*value));
}
-
- void write_data()
+
+ void write_data()
{
from_string(input_box->get_text(), *value);
}
@@ -99,7 +99,7 @@
CL_InputBox* input_box;
std::string* value;
- StringDataBox(CL_Component* parent, int y_pos, const std::string& name,
std::string* _value)
+ StringDataBox(CL_Component* parent, int y_pos, const std::string& name,
std::string* _value)
: value(_value)
{
label = new CL_Label(CL_Rect(10, y_pos, 90, y_pos + 20), name, parent);
@@ -112,12 +112,12 @@
delete input_box;
}
- void read_data()
+ void read_data()
{
input_box->set_text(*value);
}
-
- void write_data()
+
+ void write_data()
{
*value = input_box->get_text();
}
@@ -129,7 +129,7 @@
CL_CheckBox* check_box;
bool* value;
- BoolDataBox(CL_Component* parent, int y_pos, const std::string& name, bool*
_value)
+ BoolDataBox(CL_Component* parent, int y_pos, const std::string& name, bool*
_value)
: value(_value)
{
check_box = new CL_CheckBox(CL_Point(10, y_pos), name, parent);
@@ -141,12 +141,12 @@
delete check_box;
}
- void read_data()
+ void read_data()
{
check_box->set_checked(*value);
}
-
- void write_data()
+
+ void write_data()
{
*value = check_box->is_checked();
}
@@ -166,8 +166,8 @@
/** Pointer to the value that should be changed */
int* value;
- EnumDataBox(CL_Component* p, int y, const std::string& name, int* _value)
- : parent(p),
+ EnumDataBox(CL_Component* p, int y, const std::string& name, int* _value)
+ : parent(p),
start_y_pos(y),
y_pos(y),
radio_label(CL_Rect(10, y_pos, 90, y_pos+20), name, parent),
@@ -175,15 +175,15 @@
{
}
- virtual ~EnumDataBox()
+ virtual ~EnumDataBox()
{
for (RButtonIter i = radio_buttons.begin(); i != radio_buttons.end(); ++i)
{
delete (*i).second;
- }
+ }
}
- void read_data()
+ void read_data()
{
for (RButtonIter i = radio_buttons.begin(); i != radio_buttons.end(); ++i)
{
@@ -194,8 +194,8 @@
}
}
}
-
- void write_data()
+
+ void write_data()
{
for (RButtonIter i = radio_buttons.begin(); i != radio_buttons.end(); ++i)
{
@@ -204,7 +204,7 @@
*value = i->first;
return;
}
- }
+ }
}
void add_item(const std::string& name, int item_value)
@@ -222,7 +222,7 @@
y_pos += 20;
}
-
+
int get_height() {
return y_pos - start_y_pos + 5;
}
Index: generic_property_frame.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/generic_property_frame.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- generic_property_frame.hxx 30 Nov 2002 15:06:31 -0000 1.2
+++ generic_property_frame.hxx 19 Apr 2003 10:23:18 -0000 1.3
@@ -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.
@@ -34,7 +34,7 @@
public:
/** Read the data from the data pointer */
virtual void read_data() =0;
-
+
/** Write the data from the GUI to the data pointer */
virtual void write_data() =0;
};
@@ -49,12 +49,12 @@
public:
ButtonDataBox(CL_Component* parent, int y_pos, const std::string& name, Func
f)
- : button(CL_Rect(10, y_pos, 190, y_pos + 20), name, parent),
+ : button(CL_Rect(10, y_pos, 190, y_pos + 20), name, parent),
func(f)
{
slot = button.sig_clicked().connect(this, &ButtonDataBox<Func>::on_click);
}
-
+
virtual ~ButtonDataBox() {}
void on_click() { func(); }
@@ -106,7 +106,7 @@
y_pos += 25;
set_height(y_pos + 5);
}
-
+
/** Creates a listbox to represent an enumeration */
void begin_add_enum_box(const std::string& title, int*);
void add_enum_value(const std::string& name, int value);
Index: level_property_window.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/level_property_window.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- level_property_window.cxx 30 Nov 2002 17:11:55 -0000 1.12
+++ level_property_window.cxx 19 Apr 2003 10:23:18 -0000 1.13
@@ -28,10 +28,10 @@
Levelname: ...
Description: ...
Author: ........
-
+
Pingus: 100
ToSave: 50
-
+
Time: .....?
Width: 800
@@ -67,22 +67,22 @@
get_client_area ()),
time_label (CL_Rect (10, 110, 90, 130), "Time", get_client_area ()),
- time_input (CL_Rect(110, 110, 390, 130), to_string (manager->get_leveltime
()),
+ time_input (CL_Rect(110, 110, 390, 130), to_string (manager->get_leveltime
()),
get_client_area ()),
width_label (CL_Rect (10, 130, 90, 150), "Width", get_client_area ()),
- width_input (CL_Rect(110, 130, 390, 150), to_string(manager->get_width
()), get_client_area ()),
+ width_input (CL_Rect(110, 130, 390, 150), to_string(manager->get_width
()), get_client_area ()),
height_label (CL_Rect (10, 150, 90, 170), "Height", get_client_area ()),
- height_input (CL_Rect(110, 150, 390, 170), to_string(manager->get_height
()), get_client_area ()),
+ height_input (CL_Rect(110, 150, 390, 170), to_string(manager->get_height
()), get_client_area ()),
difficulty_label (CL_Rect (10, 170, 90, 190), "Difficulty",
get_client_area ()),
- difficulty_input (CL_Rect(110, 170, 390, 190), to_string
(manager->get_difficulty ()),
+ difficulty_input (CL_Rect(110, 170, 390, 190), to_string
(manager->get_difficulty ()),
get_client_area ()),
comment_label (CL_Rect(10, 190, 90, 210), "Comment", get_client_area ()),
playable_checkbox (CL_Point(10, 210), "Playable", get_client_area ()),
-
+
ok_button(CL_Rect(210, 240, 290, 260), "Ok", get_client_area()),
cancel_button(CL_Rect(310, 240, 390, 260), "Cancel", get_client_area())
{
@@ -137,7 +137,7 @@
int pingus_to_save;
if (from_string(pingus_to_save_input.get_text(), pingus_to_save))
manager->set_number_to_save (pingus_to_save);
-
+
int time;
if (from_string (time_input.get_text(), time))
manager->set_leveltime (time);
@@ -149,7 +149,7 @@
int height;
if (from_string(height_input.get_text(), height))
manager->set_height(height);
-
+
int difficulty = 40;
if (from_string(difficulty_input.get_text(), difficulty))
manager->set_difficulty(difficulty);
Index: level_property_window.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/level_property_window.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- level_property_window.hxx 30 Nov 2002 17:11:55 -0000 1.10
+++ level_property_window.hxx 19 Apr 2003 10:23:18 -0000 1.11
@@ -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.
@@ -74,7 +74,7 @@
public:
LevelPropertyWindow (CL_Component* parent, ObjectManager*);
~LevelPropertyWindow ();
-
+
void show(bool);
void on_ok_click();
Index: level_resizer.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/level_resizer.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- level_resizer.cxx 5 Dec 2002 20:38:10 -0000 1.4
+++ level_resizer.cxx 19 Apr 2003 10:23:18 -0000 1.5
@@ -64,15 +64,15 @@
}
void
-LevelResizer::drop()
+LevelResizer::drop()
{
- dragged = false;
+ dragged = false;
// Round the position to a multiple of 10
//pos.x = int(pos.x)/10*10;
//pos.y = int(pos.y)/10*10;
}
-
+
} // namespace EditorNS
/* EOF */
Index: level_resizer.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/level_resizer.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- level_resizer.hxx 5 Dec 2002 20:38:10 -0000 1.3
+++ level_resizer.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.
@@ -35,7 +35,7 @@
Vector pos;
ObjectManager* obj_manager;
bool dragged;
-public:
+public:
LevelResizer(ObjectManager* );
void set_position_offset(const Vector& offset);
Index: object_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- object_manager.cxx 18 Apr 2003 17:08:56 -0000 1.47
+++ object_manager.cxx 19 Apr 2003 10:23:18 -0000 1.48
@@ -41,7 +41,7 @@
namespace EditorNS {
-static bool EditorObj_z_pos_sorter (EditorObj* a,
+static bool EditorObj_z_pos_sorter (EditorObj* a,
EditorObj* b)
{
return a->get_z_pos () < b->get_z_pos ();
@@ -84,7 +84,7 @@
number_to_save = 25;
number_of_pingus = 50;
-
+
delete_all_objs();
editor_objs.push_back(new StartPos(50, 50));
@@ -98,7 +98,7 @@
bg_data.color = Color(.3f, 0.0f, 0.0f);
bg_data.insert_EditorObjs(this);
}
-
+
editor_objs.push_back(new LevelResizer(this));
// Set some default actions
@@ -127,10 +127,10 @@
std::cout << "Editor: Clearing current level..." << std::endl;
std::cout << "Loading new level: " << filename << std::endl;
-
+
PLF* plf = PLF::create(filename);
- editor_objs.push_back(new StartPos(plf->get_startx(),
+ editor_objs.push_back(new StartPos(plf->get_startx(),
plf->get_starty()));
std::vector<GroundpieceData> temp_surfaces = plf->get_groundpieces();
@@ -143,14 +143,14 @@
std::vector<WorldObjData*> temp_worldobj = plf->get_worldobjs_data();
- for (std::vector<GroundpieceData>::iterator i = temp_surfaces.begin(); i !=
temp_surfaces.end(); ++i)
+ for (std::vector<GroundpieceData>::iterator i = temp_surfaces.begin(); i !=
temp_surfaces.end(); ++i)
{
i->insert_EditorObjs(this);
}
for (std::vector<WorldObjData*>::iterator i = temp_worldobj.begin();
i != temp_worldobj.end();
- ++i)
+ ++i)
{
(*i)->insert_EditorObjs(this);
}
@@ -176,26 +176,26 @@
comment = plf->get_comment ();
difficulty = plf->get_difficulty ();
playable = plf->get_playable ();
-
+
delete plf;
}
void
ObjectManager::update(float delta)
{
- for (EditorObjIter i = editor_objs.begin(); i != editor_objs.end(); ++i)
+ for (EditorObjIter i = editor_objs.begin(); i != editor_objs.end(); ++i)
{
(*i)->update (delta);
}
}
-void
+void
ObjectManager::draw(EditorView * view)
{
view->draw_fillrect(0, 0, width, height,
bg.red, bg.green, bg.blue, 1.0);
-
- for (EditorObjIter i = editor_objs.begin(); i != editor_objs.end(); ++i)
+
+ for (EditorObjIter i = editor_objs.begin(); i != editor_objs.end(); ++i)
{
(*i)->draw (view);
}
@@ -220,12 +220,12 @@
<< "<pingus-level>\n"
<< " <version>1</version>\n"
<< " <global>\n";
-
+
for(std::map<std::string, std::string>::const_iterator i = levelname.begin();
i != levelname.end();
i++)
{
- xml << " <levelname lang=\"" << i->first << "\">"
+ xml << " <levelname lang=\"" << i->first << "\">"
<< i->second << "</levelname>" << std::endl;
}
@@ -237,7 +237,7 @@
<< "\">" << i->second << "</description>" << std::endl;
}
- xml << " <author>" << XMLhelper::encode_entities(author)
+ xml << " <author>" << XMLhelper::encode_entities(author)
<< "</author>\n"
<< " <number-of-pingus>" << number_of_pingus <<
"</number-of-pingus>\n"
<< " <number-to-save>" << number_to_save << "</number-to-save>\n"
@@ -250,7 +250,7 @@
<< " <music>" << music << "</music>\n"
<< " </global>\n"
<< std::endl;
-
+
// Printing actions to file
xml << " <action-list>\n";
for (std::vector<ActionData>::iterator i = actions.begin(); i !=
actions.end(); ++i) {
@@ -261,7 +261,7 @@
for (EditorObjIter i = editor_objs.begin(); i != editor_objs.end(); ++i) {
(*i)->write_xml(xml);
}
-
+
xml << "</pingus-level>\n" << std::endl;
}
@@ -270,15 +270,15 @@
{
EditorObjIter current;
EditorObjIter prev;
-
+
current = std::find(editor_objs.begin(), editor_objs.end(), obj);
- if (current == editor_objs.begin())
+ if (current == editor_objs.begin())
{
std::cout << "Editor: Cannot lower object" << std::endl;
return false;
}
-
+
prev = current;
prev--;
@@ -291,17 +291,17 @@
{
EditorObjIter current;
EditorObjIter next;
-
+
current = std::find (editor_objs.begin(), editor_objs.end(), obj);
next = current;
next++;
-
+
if (next == editor_objs.end())
{
std::cout << "Cannot raise object" << std::endl;
return false;
}
-
+
std::swap(*next, *current);
return true;
}
@@ -314,7 +314,7 @@
for (EditorObjIter it = editor_objs.begin(); it != editor_objs.end(); ++it)
if ((*it)->is_in_rect(CL_Rect(x1, y1, x2, y2)))
retval.push_back(*it);
-
+
return retval;
}
@@ -325,7 +325,7 @@
z_pos_sort();
}
-void
+void
ObjectManager::add (const EditorObjLst& lst)
{
for (EditorObjLst::const_iterator i = lst.begin(); i != lst.end(); ++i)
@@ -354,7 +354,7 @@
editor_objs.end ());
delete *i;
}
- z_pos_sort();
+ z_pos_sort();
}
EditorObj*
@@ -362,14 +362,14 @@
{
// We go reverse about the list, since the top-most object is the
// last in the list
- for(EditorObjRIter i = editor_objs.rbegin(); i != editor_objs.rend(); ++i)
+ for(EditorObjRIter i = editor_objs.rbegin(); i != editor_objs.rend(); ++i)
{
if ((*i)->is_over(pos))
{
return *i;
}
}
-
+
return 0;
}
@@ -381,7 +381,7 @@
std::cout << "Name: " << fab.get_name () << std::endl;
std::cout << "Description: " << fab.get_description () << std::endl;
std::cout << "Data: " << fab.get_data () << std::endl;
- std::cout << "done" << std::endl;
+ std::cout << "done" << std::endl;
}
std::vector<ActionData>*
Index: object_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_manager.hxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- object_manager.hxx 5 Mar 2003 19:13:59 -0000 1.27
+++ object_manager.hxx 19 Apr 2003 10:23:18 -0000 1.28
@@ -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.
@@ -39,7 +39,7 @@
// FIXME: but instead provide a better interface to interact with him.
friend class EditorEvent;
friend class Editor;
-
+
/// Other Level data
std::map<std::string, std::string> description;
std::map<std::string, std::string> levelname;
@@ -59,13 +59,13 @@
std::string music;
std::string comment;
- /** All objects which are visible in the editor */
+ /** All objects which are visible in the editor */
std::vector<EditorObj*> editor_objs;
int move_offset;
Color bg;
-
+
public:
typedef std::vector<EditorObj*>::iterator EditorObjIter;
typedef std::vector<EditorObj*>::reverse_iterator EditorObjRIter;
@@ -109,7 +109,7 @@
int get_number_of_pingus () { return number_of_pingus; }
void set_number_of_pingus (int num) { number_of_pingus = num; }
-
+
void set_leveltime (int num) { level_time = num; }
int get_leveltime () { return level_time; }
@@ -125,7 +125,7 @@
/** Return the currently selected object, if none is selected or
multiple objects are selected return 0 */
//boost::shared_ptr<EditorObj> get_current_obj();
-
+
//void move_current_objs(float x, float y);
//void drag_current_objs ();
//void drop_current_objs ();
@@ -159,7 +159,7 @@
to varify that an referenc to and object is still valid and that
the object has not yet been deleted */
bool has_object (EditorObj* obj);
-
+
/** sort all objects acording to there z_position */
void z_pos_sort ();
Index: object_selector.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- object_selector.cxx 16 Apr 2003 09:44:30 -0000 1.39
+++ object_selector.cxx 19 Apr 2003 10:23:18 -0000 1.40
@@ -80,7 +80,7 @@
ObjectSelector::~ObjectSelector ()
{
}
-
+
/** FIXME: Ugly interface, the arguments should not be the offset, but
instead the absolute position */
void
@@ -93,7 +93,7 @@
obj_mgr = arg_obj_mgr;
pos = Vector (CL_Mouse::get_x () - x_offset,
- CL_Mouse::get_y () - y_offset,
+ CL_Mouse::get_y () - y_offset,
0.0f);
select_obj_type();
@@ -112,9 +112,9 @@
font->print_left(20,200, _("7 - bumper"));
Display::flip_display();
- while (true)
+ while (true)
{
- switch (read_key())
+ switch (read_key())
{
case CL_KEY_1:
obj_mgr->add(GuillotineObj::create(pos));
@@ -175,7 +175,7 @@
data.desc = ResDescriptor(str, filename, ResDescriptor::RD_RESOURCE);
data.speed = -1;
}
-
+
data.insert_EditorObjs(obj_mgr);
}
@@ -192,30 +192,30 @@
//font->print_left(20, 110, _("5 - Liquid"));
Display::flip_display();
- while (true)
+ while (true)
{
- switch (read_key())
+ switch (read_key())
{
case CL_KEY_1:
obj_mgr->add(TeleporterObj::create(pos));
return;
-
+
case CL_KEY_2:
obj_mgr->add(SwitchDoorObj::create(pos));
return;
-
+
case CL_KEY_3:
obj_mgr->add(ConveyorBeltObj::create(pos));
return;
-
+
case CL_KEY_4:
obj_mgr->add(IceBlockObj::create(pos));
return;
-
+
case CL_KEY_5:
obj_mgr->add(InfoBoxObj::create(pos));
return;
-
+
case CL_KEY_ESCAPE:
return;
}
@@ -234,9 +234,9 @@
font->print_left(20, 70, _("2 - rain"));
Display::flip_display();
- while (!done)
+ while (!done)
{
- switch (read_key())
+ switch (read_key())
{
case CL_KEY_1:
type = "snow-generator";
@@ -248,7 +248,7 @@
break;
}
}
-
+
std::cout << "Weather objects currently not implemented" << std::endl;
obj_mgr->add(new WeatherObj(type));
@@ -269,9 +269,9 @@
font->print_left(20, 120, _("h - entrance surface (hotspot)"));
Display::flip_display();
- while (!have_name)
+ while (!have_name)
{
- switch (read_key())
+ switch (read_key())
{
case CL_KEY_1:
@@ -299,7 +299,7 @@
break;
}
}
-
+
entrance.insert_EditorObjs (obj_mgr);
}
@@ -309,16 +309,16 @@
std::string str;
ExitData data;
data.pos = pos;
-
+
str = select_surface("exits");
-
+
last_object = str;
if (str.empty())
return;
-
+
data.desc = ResDescriptor(str, "exits", ResDescriptor::RD_RESOURCE);
-
+
data.insert_EditorObjs (obj_mgr);
}
@@ -342,12 +342,12 @@
CL_Display::clear_display();
font->print_left(20, 20, _("What object type do you want?"));
font->print_left(20, 50, _("h - Hotspot"));
- font->print_left(20, 70, _("g - Groundpiece (ground) [not implemented]"));
+ font->print_left(20, 70, _("g - Groundpiece (ground) [not implemented]"));
Display::flip_display();
- while (true)
+ while (true)
{
- switch (read_key())
+ switch (read_key())
{
case CL_KEY_H:
{
@@ -370,7 +370,7 @@
HotspotData data;
data.pos = pos;
// FIXME: Ugly hack, since ClanLib appends './'
- data.desc = ResDescriptor ("../../../../../../../../../../../" +
file,
+ data.desc = ResDescriptor ("../../../../../../../../../../../" +
file,
"", ResDescriptor::RD_FILE);
data.insert_EditorObjs(obj_mgr);
return;
@@ -409,9 +409,9 @@
font->print_left(20,350, _("f - something from file (~/.pingus/images/)"));
Display::flip_display();
- while (1)
+ while (1)
{
- switch (read_key())
+ switch (read_key())
{
case CL_KEY_T:
get_trap();
@@ -420,11 +420,11 @@
case CL_KEY_B:
get_groundpiece(Groundtype::GP_BRIDGE);
return;
-
+
case CL_KEY_R:
get_groundpiece(Groundtype::GP_REMOVE);
return;
-
+
case CL_KEY_S:
get_groundpiece(Groundtype::GP_SOLID);
return;
@@ -440,7 +440,7 @@
case CL_KEY_H:
get_hotspot("hotspots");
return;
-
+
case CL_KEY_E:
get_entrance();
return;
@@ -457,7 +457,7 @@
case CL_KEY_W:
get_weather();
return;
-
+
case CL_KEY_P:
get_prefab();
return;
@@ -469,7 +469,7 @@
case CL_KEY_Z:
get_background();
return;
-
+
case CL_KEY_F:
get_from_file();
return;
@@ -496,18 +496,18 @@
CL_Display::clear_display();
font->print_left(20, 20, _("Which prefab do you want?"));
-
+
for (std::vector<std::string>::size_type i = 0; i < dir_lst.size (); ++i)
{
- font->print_left(20, 60 + i * 30, to_string(i + 1) + " - " +
dir_lst[i]);
+ font->print_left(20, 60 + i * 30, to_string(i + 1) + " - " + dir_lst[i]);
}
Display::flip_display();
-
+
int item = -1;
- while (item == -1)
+ while (item == -1)
{
- switch (read_key())
+ switch (read_key())
{
case CL_KEY_1:
item = 1;
@@ -536,8 +536,8 @@
case CL_KEY_9:
item = 9;
break;
-
- case CL_KEY_ESCAPE:
+
+ case CL_KEY_ESCAPE:
return;
}
}
@@ -566,9 +566,9 @@
font->print_left(20,110, _("4 - Thunderstorm Background"));
Display::flip_display();
- while (1)
+ while (1)
{
- switch (read_key())
+ switch (read_key())
{
case CL_KEY_1:
{
@@ -614,9 +614,9 @@
GroundpieceData data;
datafile_loaded = data_loaded[resource_file];
-
+
data.pos = pos;
-
+
std::list<std::string>* liste = res->get_resources_of_type("surface");
surface_obj sur_obj;
std::vector<surface_obj> sur_list;
@@ -650,11 +650,11 @@
keys.clear();
- while (true)
- {
+ while (true)
+ {
CL_System::keep_alive();
-
- if (keys.peek_key().state != CL_Key::NoKey)
+
+ if (keys.peek_key().state != CL_Key::NoKey)
{
key = keys.get_key();
//std::cout << "key: " << key.ascii << std::endl;
Index: object_selector.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_selector.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- object_selector.hxx 4 Mar 2003 12:53:47 -0000 1.14
+++ object_selector.hxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -41,7 +41,7 @@
{
private:
CL_Font* font;
-
+
int x_offset;
int y_offset;
@@ -50,11 +50,11 @@
std::string last_object;
std::map<std::string, bool> data_loaded;
-
+
public:
ObjectSelector();
~ObjectSelector();
-
+
void get_obj(ObjectManager* obj_mgr, int, int);
// semi private stuff, only used by object_selector_window
@@ -75,7 +75,7 @@
void get_from_file();
void get_background();
void get_prefab();
-
+
private:
ObjectSelector (const ObjectSelector&);
ObjectSelector& operator= (const ObjectSelector&);
Index: object_selector_window.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_selector_window.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- object_selector_window.hxx 3 Dec 2002 00:51:19 -0000 1.2
+++ object_selector_window.hxx 19 Apr 2003 10:23:18 -0000 1.3
@@ -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.
@@ -40,14 +40,14 @@
public:
ButtonPair (ObjectSelectorWindow* p, const std::string& name, Callback c,
int y_pos)
- : parent (p),
+ : parent (p),
callback(c),
button (CL_Rect(10, y_pos, 190, y_pos + 20), name,
parent->get_client_area())
{
button_click_slot = button.sig_clicked().connect(this,
&ButtonPair::on_click);
}
- void on_click()
+ void on_click()
{
// Call the callback, yeah, func_ptr synaxt is cool...
((*parent).*callback)();
@@ -56,7 +56,7 @@
/** Position for the next inserted button */
int y_pos;
-
+
/** container for buttons and callbacks */
std::vector<ButtonPair*> buttons;
@@ -65,7 +65,7 @@
~ObjectSelectorWindow();
void on_close_press();
-
+
void on_groundpiece_ground_press();
void on_groundpiece_solid_press();
void on_groundpiece_transparent_press();
@@ -83,7 +83,7 @@
private:
void add_button (const std::string& name, Callback callback);
-
+
ObjectSelectorWindow (const ObjectSelectorWindow&);
ObjectSelectorWindow& operator= (const ObjectSelectorWindow&);
};
Index: panel.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/panel.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- panel.cxx 18 Feb 2003 10:30:31 -0000 1.6
+++ panel.cxx 19 Apr 2003 10:23:18 -0000 1.7
@@ -46,7 +46,7 @@
{
}
-void
+void
PanelIcon::put_screen(int /*x*/, int y)
{
if (CL_Mouse::get_x() < 25 && CL_Mouse::get_y() > y && CL_Mouse::get_y() < y
+ 25)
@@ -61,7 +61,7 @@
}
if (mouse_over_time == 0)
mouse_over_time = CL_System::get_time ();
-
+
if (CL_System::get_time () - mouse_over_time > 5) {
int width = font->get_text_width (tooltip.c_str ());
CL_Display::fill_rect (28, y + 6 - 2, 32 + width, y + font->get_height
() + 6 + 2,
@@ -90,7 +90,7 @@
Panel::~Panel()
{
-
+
}
void
@@ -100,7 +100,7 @@
CL_Display::fill_rect(0, 0, 25, CL_Display::get_height(),
0.75, 0.75, 0.75, 1.0);
-
+
logo.put_screen(0, CL_Display::get_height() - logo.get_height());
for (std::vector<PanelIcon*>::iterator i = buttons.begin(); i !=
buttons.end(); ++i)
@@ -110,7 +110,7 @@
}
}
-void
+void
Panel::init()
{
if (!is_init)
@@ -120,7 +120,7 @@
buttons.push_back(new PanelIconSave);
buttons.push_back(new PanelIconInsertObject);
-
+
buttons.push_back(new PanelIconCopy);
buttons.push_back(new PanelIconObjectProperties);
buttons.push_back(new PanelIconDelete);
@@ -167,7 +167,7 @@
if (CL_Mouse::get_x() <= 25)
{
int y = 0;
-
+
for (std::vector<PanelIcon*>::iterator i = buttons.begin(); i !=
buttons.end(); ++i)
{
if (CL_Mouse::get_y() > y && CL_Mouse::get_y() < y + 25)
Index: panel.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/panel.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- panel.hxx 27 Sep 2002 11:26:45 -0000 1.8
+++ panel.hxx 19 Apr 2003 10:23:18 -0000 1.9
@@ -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.
@@ -48,7 +48,7 @@
void start();
void put_screen(int x, int y);
virtual void on_click();
-
+
private:
PanelIcon (const PanelIcon&);
PanelIcon& operator= (const PanelIcon&);
@@ -73,7 +73,7 @@
void on_release();
bool mouse_over(int x, int y);
void set_editor(Editor* e);
-
+
private:
Panel (const Panel&);
Panel& operator= (const Panel&);
Index: panel_icons.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/panel_icons.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- panel_icons.cxx 28 Mar 2003 12:06:32 -0000 1.8
+++ panel_icons.cxx 19 Apr 2003 10:23:18 -0000 1.9
@@ -42,10 +42,10 @@
PanelIconExit::PanelIconExit()
{
tooltip = _("Exit the editor (Escape)");
- sur = PingusResource::load_surface("editor/exit", "core");
+ sur = PingusResource::load_surface("editor/exit", "core");
}
-void
+void
PanelIconExit::on_click()
{
editor->get_event()->editor_exit();
@@ -57,7 +57,7 @@
sur = PingusResource::load_surface("editor/save", "core");
}
-void
+void
PanelIconSave::on_click()
{
editor->get_event()->editor_save_level_as();
@@ -69,7 +69,7 @@
sur = PingusResource::load_surface("editor/delete", "core");
}
-void
+void
PanelIconDelete::on_click()
{
editor->get_event()->editor_delete_selected_objects();
@@ -90,10 +90,10 @@
PanelIconLevelProperties::PanelIconLevelProperties()
{
tooltip = _("Edit Level Properties");
- sur = PingusResource::load_surface("editor/edit", "core");
+ sur = PingusResource::load_surface("editor/edit", "core");
}
-void
+void
PanelIconLevelProperties::on_click()
{
editor->get_event ()->editor_show_level_properties ();
@@ -114,10 +114,10 @@
PanelIconRun::PanelIconRun()
{
tooltip = _("Start the level and test it (F4)");
- sur = PingusResource::load_surface("editor/clock_run", "core");
+ sur = PingusResource::load_surface("editor/clock_run", "core");
}
-void
+void
PanelIconRun::on_click()
{
editor->get_event()->editor_start_current_level();
@@ -126,7 +126,7 @@
PanelIconNew::PanelIconNew()
{
tooltip = _("Create a new level from scratch");
- sur = PingusResource::load_surface("editor/new", "core");
+ sur = PingusResource::load_surface("editor/new", "core");
}
void
@@ -138,7 +138,7 @@
PanelIconInsertObject::PanelIconInsertObject()
{
tooltip = _("Insert an object (Insert)");
- sur = PingusResource::load_surface("editor/index", "core");
+ sur = PingusResource::load_surface("editor/index", "core");
}
void
@@ -153,7 +153,7 @@
sur = PingusResource::load_surface("editor/region-zoom", "core");
}
-void
+void
PanelIconRegionZoom::on_click()
{
editor->get_event ()->zoom_mode ();
@@ -165,7 +165,7 @@
sur = PingusResource::load_surface("editor/zoom-in", "core");
}
-void
+void
PanelIconZoomIn::on_click()
{
editor->get_event ()->editor_zoom_in ();
@@ -177,7 +177,7 @@
sur = PingusResource::load_surface("editor/zoom-out", "core");
}
-void
+void
PanelIconZoomOut::on_click()
{
editor->get_event ()->editor_zoom_out ();
Index: panel_icons.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/panel_icons.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- panel_icons.hxx 18 Feb 2003 10:30:31 -0000 1.8
+++ panel_icons.hxx 19 Apr 2003 10:23:18 -0000 1.9
@@ -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 @@
public:
PanelIconNew();
virtual void on_click();
-
+
private:
PanelIconNew (const PanelIconNew&);
PanelIconNew& operator= (const PanelIconNew&);
@@ -40,7 +40,7 @@
public:
PanelIconLoad();
virtual void on_click();
-
+
private:
PanelIconLoad (const PanelIconLoad&);
PanelIconLoad& operator= (const PanelIconLoad&);
@@ -51,7 +51,7 @@
public:
PanelIconSave();
virtual void on_click();
-
+
private:
PanelIconSave (const PanelIconSave&);
PanelIconSave& operator= (const PanelIconSave&);
@@ -62,7 +62,7 @@
public:
PanelIconCopy();
virtual void on_click();
-
+
private:
PanelIconCopy (const PanelIconCopy&);
PanelIconCopy& operator= (const PanelIconCopy&);
@@ -73,7 +73,7 @@
public:
PanelIconPaste();
virtual void on_click();
-
+
private:
PanelIconPaste (const PanelIconPaste&);
PanelIconPaste& operator= (const PanelIconPaste&);
@@ -84,7 +84,7 @@
public:
PanelIconLevelProperties();
virtual void on_click();
-
+
private:
PanelIconLevelProperties (const PanelIconLevelProperties&);
PanelIconLevelProperties& operator= (const PanelIconLevelProperties&);
@@ -95,7 +95,7 @@
public:
PanelIconObjectProperties();
virtual void on_click();
-
+
private:
PanelIconObjectProperties (const PanelIconObjectProperties&);
PanelIconObjectProperties& operator= (const PanelIconObjectProperties&);
@@ -106,7 +106,7 @@
public:
PanelIconDelete();
virtual void on_click();
-
+
private:
PanelIconDelete (const PanelIconDelete&);
PanelIconDelete& operator= (const PanelIconDelete&);
@@ -117,7 +117,7 @@
public:
PanelIconExit();
virtual void on_click();
-
+
private:
PanelIconExit (const PanelIconExit&);
PanelIconExit& operator= (const PanelIconExit&);
@@ -128,7 +128,7 @@
public:
PanelIconRun();
virtual void on_click();
-
+
private:
PanelIconRun (const PanelIconRun&);
PanelIconRun& operator= (const PanelIconRun&);
@@ -139,7 +139,7 @@
public:
PanelIconInsertObject();
virtual void on_click();
-
+
private:
PanelIconInsertObject (const PanelIconInsertObject&);
PanelIconInsertObject& operator= (const PanelIconInsertObject&);
@@ -150,7 +150,7 @@
public:
PanelIconZoomOut();
virtual void on_click();
-
+
private:
PanelIconZoomOut (const PanelIconZoomOut&);
PanelIconZoomOut& operator= (const PanelIconZoomOut&);
@@ -161,7 +161,7 @@
public:
PanelIconZoomIn();
virtual void on_click();
-
+
private:
PanelIconZoomIn (const PanelIconZoomIn&);
PanelIconZoomIn& operator= (const PanelIconZoomIn&);
@@ -172,7 +172,7 @@
public:
PanelIconRegionZoom();
virtual void on_click();
-
+
private:
PanelIconRegionZoom (const PanelIconRegionZoom&);
PanelIconRegionZoom& operator= (const PanelIconRegionZoom&);
@@ -183,7 +183,7 @@
public:
PanelIconSetupActions ();
virtual void on_click();
-
+
private:
PanelIconSetupActions (const PanelIconSetupActions&);
PanelIconSetupActions& operator= (const PanelIconSetupActions&);
@@ -195,7 +195,7 @@
public:
PanelIconHelp ();
virtual void on_click();
-
+
private:
PanelIconHelp (const PanelIconHelp&);
PanelIconHelp& operator= (const PanelIconHelp&);
Index: property_frame.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/property_frame.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- property_frame.hxx 29 Nov 2002 00:17:05 -0000 1.8
+++ property_frame.hxx 19 Apr 2003 10:23:18 -0000 1.9
@@ -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.
@@ -36,13 +36,13 @@
PropertyFrame (int width, int height, CL_Component*);
virtual std::string get_title () =0;
-
+
private:
PropertyFrame (const PropertyFrame&);
PropertyFrame& operator= (const PropertyFrame&);
};
-} // namespace EditorNS
+} // namespace EditorNS
#endif
Index: property_window.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/property_window.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- property_window.cxx 28 Mar 2003 12:06:32 -0000 1.15
+++ property_window.cxx 19 Apr 2003 10:23:18 -0000 1.16
@@ -39,11 +39,11 @@
set_client_size (200, 50);
show (false);
- set_position(CL_Display::get_width() - get_width() - 50,
+ set_position(CL_Display::get_width() - get_width() - 50,
50);
}
-void
+void
PropertyWindow::on_close_click()
{
show(false);
@@ -59,13 +59,13 @@
delete current_frame;
current_frame = 0;
}
-
+
if (obj && (current_frame = obj->get_gui_dialog (editor)))
{ // current object provides a GUI
set_title(current_frame->get_title ());
label.show (false);
//std::cout << "Got GUI" << std::endl;
- set_client_size (current_frame->get_width () + 1,
+ set_client_size (current_frame->get_width () + 1,
current_frame->get_height () + 40);
close_button.set_position(110, current_frame->get_height () + 10);
}
Index: property_window.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/property_window.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- property_window.hxx 30 Nov 2002 15:06:31 -0000 1.10
+++ property_window.hxx 19 Apr 2003 10:23:18 -0000 1.11
@@ -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 @@
private:
/** Pointer to the editor (FIXME: its actually a singleton, not really
needed) */
Editor* editor;
-
+
/** Pointer to the frame of the current object */
PropertyFrame* current_frame;
@@ -47,14 +47,14 @@
CL_Button close_button;
CL_Slot close_button_slot;
-
+
public:
PropertyWindow (Editor* parent);
/** Called once from the editor when the selection changed or if a
update() is called. */
void update_frame (EditorObj*);
-
+
void on_close_click();
private:
PropertyWindow (const PropertyWindow&);
Index: rect_editorobj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/rect_editorobj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rect_editorobj.cxx 4 Oct 2002 11:38:29 -0000 1.8
+++ rect_editorobj.cxx 19 Apr 2003 10:23:18 -0000 1.9
@@ -34,16 +34,16 @@
{
if (this != &old)
EditorObj::operator=(old);
-
+
return *this;
}
void
-RectEditorObj::draw_mark (EditorNS::EditorView * view)
+RectEditorObj::draw_mark (EditorNS::EditorView * view)
{
Vector ul(get_upper_left_corner());
- view->draw_rect(static_cast<int>(ul.x),
+ view->draw_rect(static_cast<int>(ul.x),
static_cast<int>(ul.y),
static_cast<int>(ul.x + get_width()),
static_cast<int>(ul.y + get_height()),
@@ -63,7 +63,7 @@
RectEditorObj::is_in_rect (const CL_Rect& rect)
{
Vector pos(get_upper_left_corner());
-
+
// FIXME: Simple, stupid and wrong,... but works good =;-)
return ( pos.x >= rect.x1 && pos.x < rect.x2
&& pos.y >= rect.y1 && pos.y < rect.y2);
Index: rect_editorobj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/rect_editorobj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rect_editorobj.hxx 28 Sep 2002 11:52:23 -0000 1.7
+++ rect_editorobj.hxx 19 Apr 2003 10:23:18 -0000 1.8
@@ -39,14 +39,14 @@
/** Draw the caputre rectangle around the object */
virtual void draw_mark (EditorNS::EditorView * view);
-
+
/** Return true when the object is under the given coordinates */
virtual bool is_over (const Vector&);
/** Return true if the current object is inside the current
selection rectangle */
virtual bool is_in_rect (const CL_Rect&);
-
+
protected:
RectEditorObj (const RectEditorObj& old);
RectEditorObj& operator= (const RectEditorObj& old);
Index: scroll_map.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/scroll_map.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scroll_map.cxx 25 Jan 2003 18:34:36 -0000 1.6
+++ scroll_map.cxx 19 Apr 2003 10:23:18 -0000 1.7
@@ -63,7 +63,7 @@
}
///
-bool
+bool
ScrollMap::mouse_over(int x, int y)
{
if (x > x_pos && x < x_pos + width
@@ -73,7 +73,7 @@
return false;
}
-void
+void
ScrollMap::draw()
{
CL_Display::fill_rect (x_pos, y_pos, x_pos + width, y_pos + height,
@@ -87,7 +87,7 @@
int viewarea_x_pos = int((x_pos - (view->get_offset().x * width
/ editor_event->object_manager->get_width())));
int viewarea_y_pos = int((y_pos - (view->get_offset().y * height
- /
editor_event->object_manager->get_height())));
+ /
editor_event->object_manager->get_height())));
CL_Display::fill_rect(x_pos, y_pos,
x_pos + width,
@@ -105,7 +105,7 @@
}
editor_event->object_manager->draw_scroll_map(x_pos, y_pos, width, height);
-
+
// The rectangle, which represents the complet world
Display::draw_rect(x_pos, y_pos,
Index: scroll_map.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/scroll_map.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scroll_map.hxx 25 Jan 2003 18:34:36 -0000 1.6
+++ scroll_map.hxx 19 Apr 2003 10:23:18 -0000 1.7
@@ -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.
@@ -46,7 +46,7 @@
void on_button_press(CL_InputDevice *device, const CL_Key& key);
void on_button_release(CL_InputDevice *device, const CL_Key& key);
bool mouse_over(int x, int y);
-
+
private:
ScrollMap (const ScrollMap&);
ScrollMap& operator= (const ScrollMap&);
Index: selection.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/selection.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- selection.cxx 25 Mar 2003 23:15:23 -0000 1.18
+++ selection.cxx 19 Apr 2003 10:23:18 -0000 1.19
@@ -27,28 +27,28 @@
namespace EditorNS {
void
-Selection::move(float x, float y)
+Selection::move(float x, float y)
{
for (std::vector<EditorObj*>::iterator it = obj_list.begin(); it !=
obj_list.end(); it++)
(*it)->set_position_offset(Vector(x, y));
}
void
-Selection::move(const Vector& pos)
+Selection::move(const Vector& pos)
{
for (std::vector<EditorObj*>::iterator it = obj_list.begin(); it !=
obj_list.end(); it++)
(*it)->set_position_offset(pos);
}
void
-Selection::drag()
+Selection::drag()
{
for (std::vector<EditorObj*>::iterator it = obj_list.begin(); it !=
obj_list.end(); it++)
(*it)->drag();
}
void
-Selection::drop()
+Selection::drop()
{
for (std::vector<EditorObj*>::iterator it = obj_list.begin(); it !=
obj_list.end(); it++)
(*it)->drop();
@@ -81,28 +81,28 @@
}
void
-Selection::raise()
+Selection::raise()
{
for (std::vector<EditorObj*>::iterator it = obj_list.begin(); it !=
obj_list.end(); it++)
object_manager->raise_obj(*it);
}
void
-Selection::lower()
+Selection::lower()
{
for (std::vector<EditorObj*>::iterator it = obj_list.begin(); it !=
obj_list.end(); it++)
object_manager->lower_obj(*it);
}
void
-Selection::select_rect(float x1_, float y1_, float x2_, float y2_)
+Selection::select_rect(float x1_, float y1_, float x2_, float y2_)
{
int x1, x2, y1, y2;
-
+
if (!CL_Keyboard::get_keycode(CL_KEY_LSHIFT)
&& !CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
clear();
-
+
// Rotate the rectangle, so that x1,y1 is top/left und x2,y2 is
// bottom right
x1 = static_cast<int> (Math::min(x1_, x2_));
@@ -114,7 +114,7 @@
}
EditorObj*
-Selection::get_current_obj()
+Selection::get_current_obj()
{
if (obj_list.size() == 1)
return *obj_list.begin();
@@ -123,21 +123,21 @@
}
void
-Selection::horizontal_flip()
+Selection::horizontal_flip()
{
for (std::vector<EditorObj*>::iterator it = obj_list.begin(); it !=
obj_list.end(); it++)
(*it)->horizontal_flip();
}
void
-Selection::vertical_flip()
+Selection::vertical_flip()
{
for (std::vector<EditorObj*>::iterator it = obj_list.begin(); it !=
obj_list.end(); it++)
(*it)->vertical_flip();
}
void
-Selection::rotate_90()
+Selection::rotate_90()
{
for (std::vector<EditorObj*>::iterator it = obj_list.begin(); it !=
obj_list.end(); it++)
(*it)->rotate_90();
@@ -153,8 +153,8 @@
void
Selection::draw(EditorView * view)
{
-
- for (std::vector<EditorObj*>::iterator i = obj_list.begin(); i !=
obj_list.end(); ++i)
+
+ for (std::vector<EditorObj*>::iterator i = obj_list.begin(); i !=
obj_list.end(); ++i)
{
(*i)->draw_mark(view);
}
Index: selection.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/selection.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- selection.hxx 25 Mar 2003 23:15:23 -0000 1.14
+++ selection.hxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -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.
@@ -28,20 +28,20 @@
class EditorView;
-class Selection
+class Selection
{
private:
-
+
std::vector<EditorObj*> obj_list;
ObjectManager* object_manager;
-
+
public:
-
+
Selection(ObjectManager* mng) : object_manager(mng) { }
~Selection() { }
-
+
void clear() { obj_list.clear(); }
-
+
void move(float x, float y);
void move(const Vector& pos);
void drag();
@@ -49,32 +49,32 @@
/** @return true if the obj is already in the selection, false otherwise */
bool has_object(EditorObj* obj);
-
+
/** Add the given object to the selection */
void add(EditorObj* obj);
void add(std::vector<EditorObj*> objs);
-
+
/** Remove the given object from the selection */
void remove(EditorObj* obj);
-
+
void raise();
void lower();
-
+
/** Coordinates must be given in world-co not screen-co */
void select_rect(float x1_, float y1_, float x2_, float y2_);
-
+
EditorObj* get_current_obj();
const std::vector<EditorObj*> & get_objects() { return obj_list; }
int size () { return obj_list.size (); }
-
+
void horizontal_flip();
void vertical_flip();
void rotate_90();
void rotate_270();
- void draw(EditorView* view);
-
+ void draw(EditorView* view);
+
private:
Selection (const Selection&);
Selection& operator= (const Selection&);
Index: sprite_editorobj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/sprite_editorobj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sprite_editorobj.cxx 31 Mar 2003 23:26:13 -0000 1.9
+++ sprite_editorobj.cxx 19 Apr 2003 10:23:18 -0000 1.10
@@ -60,24 +60,24 @@
SpriteEditorObj::operator= (const SpriteEditorObj& old)
{
if (this != &old)
- {
+ {
RectEditorObj::operator=(old);
-
+
sprite = old.sprite;
pos_ref = old.pos_ref;
}
-
+
return *this;
}
float
-SpriteEditorObj::get_z_pos()
+SpriteEditorObj::get_z_pos()
{
assert (pos_ref);
return pos_ref->z;
}
-void
+void
SpriteEditorObj::draw(EditorNS::EditorView * view)
{
assert (pos_ref);
@@ -85,19 +85,19 @@
}
-void
+void
SpriteEditorObj::set_position_offset(const Vector& offset)
{
assert (pos_ref);
*pos_ref += offset;
}
-Vector
-SpriteEditorObj::get_upper_left_corner()
-{
+Vector
+SpriteEditorObj::get_upper_left_corner()
+{
assert (pos_ref);
Vector pos(*pos_ref);
- return pos + Vector(sprite.get_x_align (), sprite.get_y_align ());
+ return pos + Vector(sprite.get_x_align (), sprite.get_y_align ());
}
bool
Index: sprite_editorobj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/sprite_editorobj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sprite_editorobj.hxx 28 Sep 2002 11:52:24 -0000 1.9
+++ sprite_editorobj.hxx 19 Apr 2003 10:23:18 -0000 1.10
@@ -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,9 +29,9 @@
{
protected:
Sprite sprite;
-
- /** Pointer to the position member of the child object
-
+
+ /** Pointer to the position member of the child object
+
FIXME: A bit ugly, but requires less changes than a full blown
FIXME: get/set handling, it also looks nicer */
Vector* pos_ref;
@@ -65,7 +65,7 @@
/** This will be overritten to provide pixel exact click
detection */
virtual bool is_over (const Vector&);
-
+
protected:
SpriteEditorObj (const SpriteEditorObj& old);
SpriteEditorObj& operator= (const SpriteEditorObj& old);
Index: start_pos.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/start_pos.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- start_pos.cxx 28 Sep 2002 11:52:24 -0000 1.7
+++ start_pos.cxx 19 Apr 2003 10:23:18 -0000 1.8
@@ -36,7 +36,7 @@
{
xml << " <start-position>\n";
XMLhelper::write_vector_xml(xml, pos);
- xml << " </start-position>\n" << std::endl;
+ xml << " </start-position>\n" << std::endl;
}
EditorObj*
Index: start_pos.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/start_pos.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- start_pos.hxx 29 Nov 2002 22:54:22 -0000 1.10
+++ start_pos.hxx 19 Apr 2003 10:23:18 -0000 1.11
@@ -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.
@@ -28,14 +28,14 @@
{
private:
Vector pos;
-
+
public:
StartPos(int arg_x_pos, int arg_y_pos);
void write_xml(std::ostream& xml);
EditorObj* duplicate();
- EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
+ EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
private:
StartPos (const StartPos&);
StartPos& operator= (const StartPos&);
Index: status_line.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/status_line.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- status_line.cxx 28 Sep 2002 11:52:24 -0000 1.9
+++ status_line.cxx 19 Apr 2003 10:23:18 -0000 1.10
@@ -33,11 +33,11 @@
{
font = PingusResource::load_font("Fonts/courier_small", "fonts");
}
-
+
StatusLine::~StatusLine()
{
}
-
+
void
StatusLine::draw(EditorView * view)
{
@@ -46,20 +46,20 @@
if (current_objs)
{
- if (current_objs->size() > 1)
+ if (current_objs->size() > 1)
{
status_line_text = "Group";
- }
- else if (current_objs->size() == 1)
+ }
+ else if (current_objs->size() == 1)
{
status_line_text = (*(current_objs->begin()))->status_line();
- }
- else
+ }
+ else
{
status_line_text = "";
}
}
-
+
font->print_left(50, 5, status_line_text.c_str());
Vector pos = view->screen_to_world(Vector (CL_Mouse::get_x(),
CL_Mouse::get_y ()));
Index: status_line.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/status_line.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- status_line.hxx 27 Sep 2002 11:26:45 -0000 1.10
+++ status_line.hxx 19 Apr 2003 10:23:18 -0000 1.11
@@ -36,14 +36,14 @@
private:
CL_Font* font;
const std::vector<EditorObj*>* current_objs;
-
+
public:
StatusLine();
~StatusLine();
-
+
void set_current_objs(const std::vector<EditorObj*>* c_objs);
void draw(EditorView * view);
-
+
private:
StatusLine (const StatusLine&);
StatusLine& operator= (const StatusLine&);
Index: string_reader.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/string_reader.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- string_reader.cxx 14 Sep 2002 19:06:34 -0000 1.7
+++ string_reader.cxx 19 Apr 2003 10:23:18 -0000 1.8
@@ -35,7 +35,7 @@
{
strings = 0;
description = d;
- default_string = def;
+ default_string = def;
font = PingusResource::load_font("Fonts/courier_small", "fonts");
}
@@ -65,14 +65,14 @@
draw();
finished = false;
- while (!finished)
+ while (!finished)
{
CL_System::keep_alive();
if (keys.peek_key().state != CL_Key::NoKey)
{
key = keys.get_key();
-
+
if (key.state == CL_Key::Pressed)
{
switch (key.id)
@@ -87,7 +87,7 @@
case CL_KEY_DELETE:
case CL_KEY_BACKSPACE:
if (!current_string.empty())
- current_string = current_string.substr(0,
current_string.size() - 1);
+ current_string = current_string.substr(0,
current_string.size() - 1);
break;
case CL_KEY_TAB:
case CL_KEY_SPACE:
@@ -113,7 +113,7 @@
std::string* completion;
completions.clear();
-
+
console << "\nCompletions:\n" << "~~~~~~~~~~~~" << std::endl;
for(std::list<std::string>::iterator i = strings->begin(); i !=
strings->end(); ++i)
@@ -129,7 +129,7 @@
if (completions_counter >= 1)
{
- current_string = find_uniq();
+ current_string = find_uniq();
}
// std::cout << "Searching finished" << std::endl;
}
@@ -153,14 +153,14 @@
StringReader::while_eq(const std::string& a, const std::string& b)
{
std::string ret_string;
-
+
for(std::string::size_type i = 0;
i < a.size() && i < b.size() && a[i] == b[i];
++i)
{
ret_string += a[i];
}
-
+
return ret_string;
}
Index: string_reader.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/string_reader.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- string_reader.hxx 27 Sep 2002 11:26:45 -0000 1.6
+++ string_reader.hxx 19 Apr 2003 10:23:18 -0000 1.7
@@ -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.
@@ -48,7 +48,7 @@
std::string find_uniq ();
std::string while_eq (const std::string& a, const std::string& b);
void complete_string ();
-
+
private:
StringReader (const StringReader&);
StringReader& operator= (const StringReader&);
Index: surface_selector.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/surface_selector.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface_selector.cxx 19 Feb 2003 09:50:36 -0000 1.7
+++ surface_selector.cxx 19 Apr 2003 10:23:18 -0000 1.8
@@ -37,7 +37,7 @@
SurfaceSelector::~SurfaceSelector ()
{
-
+
}
std::vector<surface_obj>::iterator
@@ -45,9 +45,9 @@
{
int x = 0;
int y = -y_of;
-
- for(std::vector<surface_obj>::iterator i = sur_list->begin();
- i != sur_list->end();
+
+ for(std::vector<surface_obj>::iterator i = sur_list->begin();
+ i != sur_list->end();
++i)
{
if (CL_Mouse::get_x() > x && CL_Mouse::get_x() <= x + 50
@@ -55,7 +55,7 @@
{
return i;
}
-
+
x += 50;
if (x + 50 > CL_Display::get_width())
{
@@ -72,23 +72,23 @@
{
// FIXME: This could heavily optimized if ClanLib would have a
put_target(x,y,w,h)
std::vector<surface_obj>::iterator tmp_obj = get_current_obj();
-
+
if (c_obj != tmp_obj)
{
if (tmp_obj != std::vector<surface_obj>::iterator())
tmp_obj->display_time = CL_System::get_time();
-
+
if (c_obj != std::vector<surface_obj>::iterator())
c_obj->display_time = 0;
}
-
+
c_obj = tmp_obj;
int x = 0;
int y = -y_of;
CL_System::keep_alive();
-
+
CL_Display::clear_display();
// Draw all surfaces
@@ -96,7 +96,7 @@
{
if (i->thumbnail.get_width() <= 50 && i->thumbnail.get_height() <= 50)
{
- i->thumbnail.put_screen(x + 25 - (i->thumbnail.get_width() / 2),
+ i->thumbnail.put_screen(x + 25 - (i->thumbnail.get_width() / 2),
y + 25 - (i->thumbnail.get_height() / 2));
}
else
@@ -110,7 +110,7 @@
}
x += 50;
- if (x + 50 > CL_Display::get_width())
+ if (x + 50 > CL_Display::get_width())
{
y += 50;
x = 0;
@@ -154,8 +154,8 @@
{
y_of -= range - CL_Mouse::get_y();
}
-
- if (y_of < 0) y_of = 0;
+
+ if (y_of < 0) y_of = 0;
if (y_of > height) y_of = height;
}
@@ -171,12 +171,12 @@
draw();
scroll();
-
+
CL_System::keep_alive();
- }
+ }
iter = get_current_obj();
-
+
if (iter != std::vector<surface_obj>::iterator())
str = iter->name;
Index: surface_selector.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/surface_selector.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface_selector.hxx 27 Sep 2002 11:26:45 -0000 1.7
+++ surface_selector.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.
@@ -44,7 +44,7 @@
/** The time the small tumbnail was selected, when the mouse is
longer than 1sec above the surface it will be enlarged */
unsigned int display_time;
-
+
surface_obj ();
surface_obj (const surface_obj& old);
surface_obj& operator= (const surface_obj& old);
@@ -64,17 +64,17 @@
std::vector<surface_obj>::iterator get_current_obj ();
std::vector<surface_obj>::iterator c_obj;
-
+
public:
SurfaceSelector (std::vector<surface_obj>*);
~SurfaceSelector ();
std::string select ();
-
+
private:
SurfaceSelector (const SurfaceSelector&);
SurfaceSelector& operator= (const SurfaceSelector&);
-};
+};
#endif
Index: thumb_cache.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/thumb_cache.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- thumb_cache.cxx 28 Mar 2003 12:06:32 -0000 1.12
+++ thumb_cache.cxx 19 Apr 2003 10:23:18 -0000 1.13
@@ -53,7 +53,7 @@
if (maintainer_mode)
pout << "ThumbCache: Loading: " << res_ident << " (" << datafile << ")"
<< std::endl;
-
+
// Add object to cache
return ThumbCache::cache (sur, res_ident, datafile);
}
@@ -74,10 +74,10 @@
if (System::exist (filename))
{
//FILE* in = fopen (filename.c_str (), "r");
- try
+ try
{
CL_InputSource_File in(filename);
-
+
unsigned int version = in.read_uint32 ();
if (version != thumbcache_version)
{
@@ -102,10 +102,10 @@
size_t buffer_size = width * height * 4;
size_t read_size = in.read (buffer, buffer_size);
-
+
if (read_size != buffer_size)
{
- perr(PINGUS_DEBUG_EDITOR) << "ThumbCache: " << filename << ":
read error: wanted "
+ perr(PINGUS_DEBUG_EDITOR) << "ThumbCache: " << filename << ":
read error: wanted "
<< buffer_size << " got " << read_size
<< std::endl;
delete canvas;
return uncached_load (res_ident, datafile);
@@ -123,7 +123,7 @@
return uncached_load (res_ident, datafile);
}
-CL_Surface
+CL_Surface
ThumbCache::cache (const CL_Surface& sur, const std::string & res_ident, const
std::string & datafile)
{
if (sur.get_provider ()->get_height () < 50
@@ -132,10 +132,10 @@
// If the image is smaller than the thumbnail, there is no need to cache
it
if (maintainer_mode)
pout << "ThumbCache: image too small for cache: " << res_ident <<
std::endl;
-
+
return sur;
}
-
+
std::string filename = res_ident + "-" + datafile;
for (unsigned int i = 0; i < filename.size (); ++i)
@@ -147,10 +147,10 @@
unsigned int timestamp = PingusResource::get_mtime (res_ident, datafile);
if (maintainer_mode)
- pout << "ThumbCache: Writing cache file: " << filename
+ pout << "ThumbCache: Writing cache file: " << filename
<< " timestamp: " << timestamp << std::endl;
-
- try
+
+ try
{
CL_OutputSource_File out(filename);
@@ -158,11 +158,11 @@
unsigned int height = Math::min((unsigned int)50, sur.get_height ());
// Caller is responsible to delete the canvas
- CL_Canvas* canvas = Blitter::scale_surface_to_canvas (sur, width,
height);
+ CL_Canvas* canvas = Blitter::scale_surface_to_canvas (sur, width,
height);
canvas->lock ();
void* buffer = canvas->get_data();
int buffer_size = canvas->get_height () * canvas->get_pitch ();
-
+
// Versionnumber of the thumbnail format
out.write_uint32 (thumbcache_version);
@@ -172,7 +172,7 @@
// Modification time of the parent file
out.write_uint32 (timestamp);
- // Surface data
+ // Surface data
// FIXME: Endian issue here?!
out.write (buffer, buffer_size);
@@ -180,15 +180,15 @@
// Canvas will get deleted on the end of the lifetime of this surface
return CL_Surface (canvas, true);
}
- catch (CL_Error&)
+ catch (CL_Error&)
{
perr << "ThumbCache: Couldn't open file for writing: " << filename <<
std::endl;
-
+
// If writing the surface fails, we return the surface without
// writing it to the cache
unsigned int width = Math::min((unsigned int)50, sur.get_width ());
unsigned int height = Math::min((unsigned int)50, sur.get_height ());
- return Blitter::scale_surface (sur, width, height);
+ return Blitter::scale_surface (sur, width, height);
}
}
Index: thumb_cache.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/thumb_cache.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- thumb_cache.hxx 27 Sep 2002 11:26:46 -0000 1.8
+++ thumb_cache.hxx 19 Apr 2003 10:23:18 -0000 1.9
@@ -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.
@@ -43,10 +43,10 @@
/** Add a surface as thumbnail to the cache, the surface will be
resized to a 50x50 size, the return value is the resized surface */
static CL_Surface cache (const CL_Surface&, const std::string & res_ident,
const std::string & datafile);
-
+
private:
ThumbCache (const ThumbCache&);
- ThumbCache& operator= (const ThumbCache&);
+ ThumbCache& operator= (const ThumbCache&);
};
} // namespace EditorNS
Index: weather_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/weather_obj.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- weather_obj.cxx 28 Sep 2002 11:52:24 -0000 1.11
+++ weather_obj.cxx 19 Apr 2003 10:23:18 -0000 1.12
@@ -35,8 +35,8 @@
else if (type == "snow-generator")
{
sprite = Sprite("editor/weather_snow", "core");
- }
- else
+ }
+ else
{
std::cout << "WeatherObj: Unknown weather type: " << type << std::endl;
sprite = Sprite("editor/weather_rain", "core");
@@ -49,11 +49,11 @@
{
}
-void
+void
WeatherObj::draw (EditorNS::EditorView * view)
{
//std::cout << "Dragging: " << dragging << std::endl;
-
+
if (dragging)
{
for (int x = 0; x < 320; x += sprite.get_width () + 4)
@@ -72,8 +72,8 @@
SpriteEditorObj::draw (view);
pos = tmp_pos;
}
-
-void
+
+void
WeatherObj::write_xml(std::ostream& xml)
{
xml << " <worldobj type=\"" << type << "\">\n";
@@ -81,20 +81,20 @@
xml << " </worldobj>\n"
<< std::endl;
}
-
+
EditorObj*
WeatherObj::duplicate()
{
return new WeatherObj(type);
}
-void
+void
WeatherObj::drag ()
{
dragging = true;
}
-void
+void
WeatherObj::drop ()
{
dragging = false;
Index: weather_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/weather_obj.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- weather_obj.hxx 28 Nov 2002 20:09:54 -0000 1.11
+++ weather_obj.hxx 19 Apr 2003 10:23:18 -0000 1.12
@@ -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,19 +29,19 @@
std::string type;
Vector pos;
bool dragging;
-
+
public:
WeatherObj (const std::string& type_);
virtual ~WeatherObj();
void drag ();
void drop ();
-
+
void draw (EditorNS::EditorView * view);
void write_xml(std::ostream& xml);
EditorObj* duplicate();
- EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
+ EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
private:
WeatherObj (const WeatherObj&);
WeatherObj& operator= (const WeatherObj&);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.15,1.16 action_window.hxx,1.8,1.9 editor.cxx,1.50,1.51 editor.hxx,1.24,1.25 editor_event.cxx,1.56,1.57 editor_event.hxx,1.17,1.18 editor_help_screen.cxx,1.9,1.10 editor_help_screen.hxx,1.5,1.6 editor_view.cxx,1.7,1.8 editor_view.hxx,1.7,1.8 editorobj.cxx,1.6,1.7 editorobj.hxx,1.18,1.19 editorobj_group.cxx,1.9,1.10 editorobj_group.hxx,1.15,1.16 editorobj_mgr.hxx,1.1,1.2 generic_property_frame.cxx,1.5,1.6 generic_property_frame.hxx,1.2,1.3level_property_window.cxx,1.12,1.13 level_property_window.hxx,1.10,1.11 level_resizer.cxx,1.4,1.5 level_resizer.hxx,1.3,1.4 object_manager.cxx,1.47,1.48 object_manager.hxx,1.27,1.28 object_selector.cxx,1.39,1.40 object_selector.hxx,1.14,1.15 object_selector_window.hxx,1.2,1.3 panel.cxx,1.6,1.7 panel.hxx,1.8,1.9 panel_icons.cxx,1.8,1.9 panel_icons.hxx,1.8,1.9 property_frame.hxx,1.8,1.9 property_window.cxx,1.15,1.16 property_window.hxx,1.10,1.11 rect_editorobj.cxx,1.8,1.9 rect_editorobj.hxx,1.7,1.8 scroll_map.cxx,1.6,1.7 scroll_map.hxx,1.6,1.7 selection.cxx,1.18,1.19 selection.hxx,1.14,1.15 sprite_editorobj.cxx,1.9,1.10 sprite_editorobj.hxx,1.9,1.10 start_pos.cxx,1.7,1.8 start_pos.hxx,1.10,1.11 status_line.cxx,1.9,1.10 status_line.hxx,1.10,1.11 string_reader.cxx,1.7,1.8 string_reader.hxx,1.6,1.7 surface_selector.cxx,1.7,1.8 surface_selector.hxx,1.7,1.8 thumb_cache.cxx,1.12,1.13 thumb_cache.hxx,1.8,1.9 weather_obj.cxx,1.11,1.12 weather_obj.hxx,1.11,1.12,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.29,1.30 action_button.hxx,1.16,1.17 action_data.cxx,1.6,1.7 action_data.hxx,1.6,1.7 action_holder.cxx,1.11,1.12 action_holder.hxx,1.11,1.12 alpha_button.cxx,1.2,1.3 alpha_button.hxx,1.5,1.6 blitter.cxx,1.27,1.28 blitter.hxx,1.9,1.10 blitter_impl.hxx,1.9,1.10 button_panel.cxx,1.24,1.25 button_panel.hxx,1.17,1.18 capture_rectangle.cxx,1.12,1.13 capture_rectangle.hxx,1.6,1.7 cheat.cxx,1.2,1.3 cheat.hxx,1.1,1.2 client.cxx,1.44,1.45 col_map.cxx,1.17,1.18 col_map.hxx,1.10,1.11 color.cxx,1.2,1.3 color.hxx,1.6,1.7 config.cxx,1.14,1.15 config.hxx,1.8,1.9 config_xml.cxx,1.3,1.4 config_xml.hxx,1.3,1.4 console.cxx,1.12,1.13 console.hxx,1.12,1.13 counter.cxx,1.4,1.5 credits.cxx,1.31,1.32 credits.hxx,1.12,1.13 debug.hxx,1.2,1.3 debug_stream.cxx,1.7,1.8 debug_stream.hxx,1.9,1.10 delta_manager.hxx,1.9,1.10 demo_player.cxx,1.8,1.9 demo_player.hxx,1.6,1.7 demo_recorder.cxx,1.17,1.18 demo_recorder.hxx,1.8,1.9 demo_session.cxx,1.7,1.8 demo_session.hxx,1.4,1.5 direction.cxx,1.2,1.3 direction.hxx,1.5,1.6 exit_menu.cxx,1.18,1.19 exit_menu.hxx,1.10,1.11 fade_out.cxx,1.7,1.8 fade_out.hxx,1.5,1.6 file_reader.hxx,1.2,1.3 file_writer.hxx,1.2,1.3 fonts.hxx,1.4,1.5 fps_counter.cxx,1.5,1.6 fps_counter.hxx,1.6,1.7 game_counter.cxx,1.2,1.3 game_counter.hxx,1.6,1.7 game_event.hxx,1.6,1.7 game_session.cxx,1.39,1.40 game_session.hxx,1.18,1.19 game_session_result.cxx,1.2,1.3 game_session_result.hxx,1.5,1.6 game_time.cxx,1.8,1.9 game_time.hxx,1.9,1.10 global_event.cxx,1.9,1.10 global_event.hxx,1.6,1.7 globals.cxx,1.13,1.14 globals.hxx,1.16,1.17 goal_manager.cxx,1.6,1.7 goal_manager.hxx,1.3,1.4 groundtype.cxx,1.1,1.2 groundtype.hxx,1.2,1.3 gui_obj.cxx,1.1,1.2 gui_obj.hxx,1.7,1.8 html_browser.hxx,1.3,1.4 hurry_up.cxx,1.6,1.7 hurry_up.hxx,1.7,1.8 indexed_canvas.hxx,1.2,1.3 input_event.hxx,1.8,1.9 layer_manager.cxx,1.5,1.6 layer_manager.hxx,1.9,1.10 level_desc.cxx,1.10,1.11 level_desc.hxx,1.5,1.6 level_interrupt.hxx,1.5,1.6 level_result.cxx,1.13,1.14 level_result.hxx,1.5,1.6 libxmlfwd.hxx,1.3,1.4 loading.cxx,1.4,1.5 loading.hxx,1.5,1.6 main_menu.hxx,1.5,1.6 math.hxx,1.7,1.8 menu_background.cxx,1.8,1.9 menu_background.hxx,1.7,1.8 menu_button.cxx,1.8,1.9 menu_button.hxx,1.2,1.3 mover.hxx,1.2,1.3 multiline_text.cxx,1.6,1.7 multiline_text.hxx,1.5,1.6 my_gettext.hxx,1.4,1.5 path_manager.cxx,1.5,1.6 path_manager.hxx,1.5,1.6 pingu.cxx,1.41,1.42 pingu.hxx,1.24,1.25 pingu_action.cxx,1.24,1.25 pingu_action.hxx,1.26,1.27 pingu_action_factory.cxx,1.14,1.15 pingu_action_factory.hxx,1.11,1.12 pingu_enums.cxx,1.6,1.7 pingu_holder.cxx,1.20,1.21 pingu_holder.hxx,1.14,1.15 pingu_map.cxx,1.6,1.7 pingu_map.hxx,1.5,1.6 pingus.hxx,1.6,1.7 pingus_counter.cxx,1.13,1.14 pingus_counter_bar.cxx,1.5,1.6 pingus_counter_bar.hxx,1.4,1.5 pingus_error.cxx,1.8,1.9 pingus_error.hxx,1.7,1.8 pingus_main.cxx,1.86,1.87 pingus_main.hxx,1.11,1.12 pingus_map_manager.cxx,1.2,1.3 pingus_map_manager.hxx,1.5,1.6 pingus_menu.cxx,1.19,1.20 pingus_menu.hxx,1.10,1.11 pingus_menu_manager.cxx,1.25,1.26 pingus_menu_manager.hxx,1.20,1.21 pingus_resource.cxx,1.27,1.28 pingus_resource.hxx,1.13,1.14 pingus_sub_menu.hxx,1.8,1.9 playfield.cxx,1.34,1.35 playfield.hxx,1.15,1.16 playfield_view.cxx,1.4,1.5 playfield_view.hxx,1.8,1.9 plf.cxx,1.15,1.16 plf.hxx,1.10,1.11 plf_handle.hxx,1.1,1.2 plf_res_mgr.cxx,1.4,1.5 plf_res_mgr.hxx,1.2,1.3 plt_xml.cxx,1.11,1.12 plt_xml.hxx,1.7,1.8 prefab.cxx,1.6,1.7 prefab.hxx,1.5,1.6 range.cxx,1.1,1.2 range.hxx,1.5,1.6 res_descriptor.cxx,1.15,1.16 res_descriptor.hxx,1.12,1.13 resource_modifier.cxx,1.2,1.3 resource_modifier.hxx,1.4,1.5 result.cxx,1.2,1.3 result.hxx,1.7,1.8 result_screen.cxx,1.14,1.15 result_screen.hxx,1.3,1.4 savegame.cxx,1.2,1.3 savegame.hxx,1.2,1.3 savegame_manager.cxx,1.6,1.7 savegame_manager.hxx,1.2,1.3 screenshot.cxx,1.11,1.12 screenshot.hxx,1.6,1.7 server.cxx,1.27,1.28 server.hxx,1.14,1.15 server_event.cxx,1.7,1.8 server_event.hxx,1.3,1.4 smallmap.cxx,1.36,1.37 smallmap.hxx,1.17,1.18 smallmap_image.cxx,1.9,1.10 smallmap_image.hxx,1.8,1.9 spot_map.cxx,1.25,1.26 spot_map.hxx,1.8,1.9 sprite.cxx,1.13,1.14 sprite.hxx,1.9,1.10 start_screen.cxx,1.18,1.19 start_screen.hxx,1.4,1.5 stat_manager.cxx,1.7,1.8 stat_manager.hxx,1.1,1.2 story.cxx,1.25,1.26 story.hxx,1.13,1.14 story_screen.cxx,1.18,1.19 story_screen.hxx,1.5,1.6 string_converter.hxx,1.11,1.12 string_format.cxx,1.1,1.2 string_tokenizer.hxx,1.2,1.3 system.cxx,1.18,1.19 system.hxx,1.9,1.10 target_provider.cxx,1.1,1.2 target_provider.hxx,1.5,1.6 theme.cxx,1.16,1.17 theme.hxx,1.5,1.6 theme_selector.cxx,1.11,1.12 theme_selector.hxx,1.5,1.6 time_display.cxx,1.13,1.14 time_display.hxx,1.10,1.11 timer.cxx,1.4,1.5 timer.hxx,1.6,1.7 true_server.cxx,1.19,1.20 true_server.hxx,1.12,1.13 usb_mouse_controller.cxx,1.3,1.4 usb_mouse_controller.hxx,1.6,1.7 vector.cxx,1.3,1.4 vector.hxx,1.3,1.4 view.cxx,1.13,1.14 view.hxx,1.11,1.12 wav_provider.cxx,1.5,1.6 wav_provider.hxx,1.5,1.6 world.cxx,1.44,1.45 world.hxx,1.27,1.28 worldobj.cxx,1.11,1.12 worldobj.hxx,1.11,1.12 worldobj_data.hxx,1.10,1.11 worldobj_data_factory.cxx,1.33,1.34 worldobj_data_factory.hxx,1.6,1.7 xml_file_reader.cxx,1.3,1.4 xml_file_reader.hxx,1.4,1.5 xml_file_writer.cxx,1.3,1.4 xml_file_writer.hxx,1.4,1.5 xml_helper.cxx,1.30,1.31 xml_helper.hxx,1.20,1.21 xml_pdf.cxx,1.7,1.8 xml_pdf.hxx,1.2,1.3 xml_plf.cxx,1.37,1.38 xml_plf.hxx,1.9,1.10
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/data/images/fonts pingus_large.png,NONE,1.1 pingus_small.png,NONE,1.1 chalk_large.png,1.4,1.5 chalk_normal.png,1.4,1.5 chalk_small.png,1.2,1.3
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.29,1.30 action_button.hxx,1.16,1.17 action_data.cxx,1.6,1.7 action_data.hxx,1.6,1.7 action_holder.cxx,1.11,1.12 action_holder.hxx,1.11,1.12 alpha_button.cxx,1.2,1.3 alpha_button.hxx,1.5,1.6 blitter.cxx,1.27,1.28 blitter.hxx,1.9,1.10 blitter_impl.hxx,1.9,1.10 button_panel.cxx,1.24,1.25 button_panel.hxx,1.17,1.18 capture_rectangle.cxx,1.12,1.13 capture_rectangle.hxx,1.6,1.7 cheat.cxx,1.2,1.3 cheat.hxx,1.1,1.2 client.cxx,1.44,1.45 col_map.cxx,1.17,1.18 col_map.hxx,1.10,1.11 color.cxx,1.2,1.3 color.hxx,1.6,1.7 config.cxx,1.14,1.15 config.hxx,1.8,1.9 config_xml.cxx,1.3,1.4 config_xml.hxx,1.3,1.4 console.cxx,1.12,1.13 console.hxx,1.12,1.13 counter.cxx,1.4,1.5 credits.cxx,1.31,1.32 credits.hxx,1.12,1.13 debug.hxx,1.2,1.3 debug_stream.cxx,1.7,1.8 debug_stream.hxx,1.9,1.10 delta_manager.hxx,1.9,1.10 demo_player.cxx,1.8,1.9 demo_player.hxx,1.6,1.7 demo_recorder.cxx,1.17,1.18 demo_recorder.hxx,1.8,1.9 demo_session.cxx,1.7,1.8 demo_session.hxx,1.4,1.5 direction.cxx,1.2,1.3 direction.hxx,1.5,1.6 exit_menu.cxx,1.18,1.19 exit_menu.hxx,1.10,1.11 fade_out.cxx,1.7,1.8 fade_out.hxx,1.5,1.6 file_reader.hxx,1.2,1.3 file_writer.hxx,1.2,1.3 fonts.hxx,1.4,1.5 fps_counter.cxx,1.5,1.6 fps_counter.hxx,1.6,1.7 game_counter.cxx,1.2,1.3 game_counter.hxx,1.6,1.7 game_event.hxx,1.6,1.7 game_session.cxx,1.39,1.40 game_session.hxx,1.18,1.19 game_session_result.cxx,1.2,1.3 game_session_result.hxx,1.5,1.6 game_time.cxx,1.8,1.9 game_time.hxx,1.9,1.10 global_event.cxx,1.9,1.10 global_event.hxx,1.6,1.7 globals.cxx,1.13,1.14 globals.hxx,1.16,1.17 goal_manager.cxx,1.6,1.7 goal_manager.hxx,1.3,1.4 groundtype.cxx,1.1,1.2 groundtype.hxx,1.2,1.3 gui_obj.cxx,1.1,1.2 gui_obj.hxx,1.7,1.8 html_browser.hxx,1.3,1.4 hurry_up.cxx,1.6,1.7 hurry_up.hxx,1.7,1.8 indexed_canvas.hxx,1.2,1.3 input_event.hxx,1.8,1.9 layer_manager.cxx,1.5,1.6 layer_manager.hxx,1.9,1.10 level_desc.cxx,1.10,1.11 level_desc.hxx,1.5,1.6 level_interrupt.hxx,1.5,1.6 level_result.cxx,1.13,1.14 level_result.hxx,1.5,1.6 libxmlfwd.hxx,1.3,1.4 loading.cxx,1.4,1.5 loading.hxx,1.5,1.6 main_menu.hxx,1.5,1.6 math.hxx,1.7,1.8 menu_background.cxx,1.8,1.9 menu_background.hxx,1.7,1.8 menu_button.cxx,1.8,1.9 menu_button.hxx,1.2,1.3 mover.hxx,1.2,1.3 multiline_text.cxx,1.6,1.7 multiline_text.hxx,1.5,1.6 my_gettext.hxx,1.4,1.5 path_manager.cxx,1.5,1.6 path_manager.hxx,1.5,1.6 pingu.cxx,1.41,1.42 pingu.hxx,1.24,1.25 pingu_action.cxx,1.24,1.25 pingu_action.hxx,1.26,1.27 pingu_action_factory.cxx,1.14,1.15 pingu_action_factory.hxx,1.11,1.12 pingu_enums.cxx,1.6,1.7 pingu_holder.cxx,1.20,1.21 pingu_holder.hxx,1.14,1.15 pingu_map.cxx,1.6,1.7 pingu_map.hxx,1.5,1.6 pingus.hxx,1.6,1.7 pingus_counter.cxx,1.13,1.14 pingus_counter_bar.cxx,1.5,1.6 pingus_counter_bar.hxx,1.4,1.5 pingus_error.cxx,1.8,1.9 pingus_error.hxx,1.7,1.8 pingus_main.cxx,1.86,1.87 pingus_main.hxx,1.11,1.12 pingus_map_manager.cxx,1.2,1.3 pingus_map_manager.hxx,1.5,1.6 pingus_menu.cxx,1.19,1.20 pingus_menu.hxx,1.10,1.11 pingus_menu_manager.cxx,1.25,1.26 pingus_menu_manager.hxx,1.20,1.21 pingus_resource.cxx,1.27,1.28 pingus_resource.hxx,1.13,1.14 pingus_sub_menu.hxx,1.8,1.9 playfield.cxx,1.34,1.35 playfield.hxx,1.15,1.16 playfield_view.cxx,1.4,1.5 playfield_view.hxx,1.8,1.9 plf.cxx,1.15,1.16 plf.hxx,1.10,1.11 plf_handle.hxx,1.1,1.2 plf_res_mgr.cxx,1.4,1.5 plf_res_mgr.hxx,1.2,1.3 plt_xml.cxx,1.11,1.12 plt_xml.hxx,1.7,1.8 prefab.cxx,1.6,1.7 prefab.hxx,1.5,1.6 range.cxx,1.1,1.2 range.hxx,1.5,1.6 res_descriptor.cxx,1.15,1.16 res_descriptor.hxx,1.12,1.13 resource_modifier.cxx,1.2,1.3 resource_modifier.hxx,1.4,1.5 result.cxx,1.2,1.3 result.hxx,1.7,1.8 result_screen.cxx,1.14,1.15 result_screen.hxx,1.3,1.4 savegame.cxx,1.2,1.3 savegame.hxx,1.2,1.3 savegame_manager.cxx,1.6,1.7 savegame_manager.hxx,1.2,1.3 screenshot.cxx,1.11,1.12 screenshot.hxx,1.6,1.7 server.cxx,1.27,1.28 server.hxx,1.14,1.15 server_event.cxx,1.7,1.8 server_event.hxx,1.3,1.4 smallmap.cxx,1.36,1.37 smallmap.hxx,1.17,1.18 smallmap_image.cxx,1.9,1.10 smallmap_image.hxx,1.8,1.9 spot_map.cxx,1.25,1.26 spot_map.hxx,1.8,1.9 sprite.cxx,1.13,1.14 sprite.hxx,1.9,1.10 start_screen.cxx,1.18,1.19 start_screen.hxx,1.4,1.5 stat_manager.cxx,1.7,1.8 stat_manager.hxx,1.1,1.2 story.cxx,1.25,1.26 story.hxx,1.13,1.14 story_screen.cxx,1.18,1.19 story_screen.hxx,1.5,1.6 string_converter.hxx,1.11,1.12 string_format.cxx,1.1,1.2 string_tokenizer.hxx,1.2,1.3 system.cxx,1.18,1.19 system.hxx,1.9,1.10 target_provider.cxx,1.1,1.2 target_provider.hxx,1.5,1.6 theme.cxx,1.16,1.17 theme.hxx,1.5,1.6 theme_selector.cxx,1.11,1.12 theme_selector.hxx,1.5,1.6 time_display.cxx,1.13,1.14 time_display.hxx,1.10,1.11 timer.cxx,1.4,1.5 timer.hxx,1.6,1.7 true_server.cxx,1.19,1.20 true_server.hxx,1.12,1.13 usb_mouse_controller.cxx,1.3,1.4 usb_mouse_controller.hxx,1.6,1.7 vector.cxx,1.3,1.4 vector.hxx,1.3,1.4 view.cxx,1.13,1.14 view.hxx,1.11,1.12 wav_provider.cxx,1.5,1.6 wav_provider.hxx,1.5,1.6 world.cxx,1.44,1.45 world.hxx,1.27,1.28 worldobj.cxx,1.11,1.12 worldobj.hxx,1.11,1.12 worldobj_data.hxx,1.10,1.11 worldobj_data_factory.cxx,1.33,1.34 worldobj_data_factory.hxx,1.6,1.7 xml_file_reader.cxx,1.3,1.4 xml_file_reader.hxx,1.4,1.5 xml_file_writer.cxx,1.3,1.4 xml_file_writer.hxx,1.4,1.5 xml_helper.cxx,1.30,1.31 xml_helper.hxx,1.20,1.21 xml_pdf.cxx,1.7,1.8 xml_pdf.hxx,1.2,1.3 xml_plf.cxx,1.37,1.38 xml_plf.hxx,1.9,1.10
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/data/images/fonts pingus_large.png,NONE,1.1 pingus_small.png,NONE,1.1 chalk_large.png,1.4,1.5 chalk_normal.png,1.4,1.5 chalk_small.png,1.2,1.3
- Index(es):