[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.51,1.52 editor_help_screen.cxx,1.10,1.11 object_selector.cxx,1.40,1.41 panel.cxx,1.7,1.8 status_line.cxx,1.10,1.11 string_reader.cxx,1.8,1.9 surface_selector.cxx,1.8,1.9

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv27448/editor

Modified Files:
        editor.cxx editor_help_screen.cxx object_selector.cxx 
        panel.cxx status_line.cxx string_reader.cxx 
        surface_selector.cxx 
Log Message:
- replaced PingusResource::load_font with Fonts:fontname
- added bigendian workaround for alpha fonts

Index: editor.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- editor.cxx  19 Apr 2003 10:23:18 -0000      1.51
+++ editor.cxx  22 Apr 2003 16:40:41 -0000      1.52
@@ -46,6 +46,7 @@
 #include "../path_manager.hxx"
 #include "../stat_manager.hxx"
 #include "../string_converter.hxx"
+#include "../fonts.hxx"
 #include "editor_view.hxx"
 
 #include <cstdio>
@@ -105,7 +106,7 @@
 
   event->set_editor(this);
 
-  font = PingusResource::load_font("Fonts/courier_small", "fonts");
+  font = Fonts::courier_small;
   panel->init();
   status_line->set_current_objs(&selection->get_objects());
   panel->set_editor(this);

Index: editor_help_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_help_screen.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- editor_help_screen.cxx      19 Apr 2003 10:23:18 -0000      1.10
+++ editor_help_screen.cxx      22 Apr 2003 16:40:41 -0000      1.11
@@ -21,11 +21,12 @@
 #include <ClanLib/Display/Font/font.h>
 #include "../my_gettext.hxx"
 #include "../pingus_resource.hxx"
+#include "../fonts.hxx"
 #include "editor_help_screen.hxx"
 
 EditorHelpScreen::EditorHelpScreen ()
-  : font (PingusResource::load_font("Fonts/pingus_small", "fonts")),
-    large_font (PingusResource::load_font("Fonts/pingus", "fonts"))
+  : font (Fonts::pingus_small),
+    large_font (Fonts::pingus_large)
 {
 
 }

Index: object_selector.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- object_selector.cxx 19 Apr 2003 10:23:18 -0000      1.40
+++ object_selector.cxx 22 Apr 2003 16:40:41 -0000      1.41
@@ -64,6 +64,7 @@
 #include "../editorobjs/spike_obj.hxx"
 #include "../editorobjs/switch_door_obj.hxx"
 #include "../editorobjs/teleporter_obj.hxx"
+#include "../fonts.hxx"
 
 using namespace EditorObjs;
 using namespace WorldObjsData;
@@ -73,7 +74,7 @@
 ObjectSelector::ObjectSelector ()
 {
   last_object = "GroundPieces/";
-  font = PingusResource::load_font("Fonts/courier_small", "fonts");
+  font = Fonts::courier_small;
   //data_loaded = false;
 }
 

Index: panel.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/panel.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- panel.cxx   19 Apr 2003 10:23:18 -0000      1.7
+++ panel.cxx   22 Apr 2003 16:40:41 -0000      1.8
@@ -24,6 +24,7 @@
 #include <ClanLib/Display/Font/font.h>
 #include "../globals.hxx"
 #include "../pingus_resource.hxx"
+#include "../fonts.hxx"
 #include "panel_icons.hxx"
 
 namespace EditorNS {
@@ -34,7 +35,7 @@
 {
   button = PingusResource::load_surface("editor/button","core");
   button_pressed = PingusResource::load_surface("editor/button_pressed", 
"core");
-  font = PingusResource::load_font("Fonts/courier_small", "fonts");
+  font = Fonts::courier_small;
 }
 
 PanelIcon::~PanelIcon()

Index: status_line.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/status_line.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- status_line.cxx     19 Apr 2003 10:23:18 -0000      1.10
+++ status_line.cxx     22 Apr 2003 16:40:41 -0000      1.11
@@ -23,6 +23,7 @@
 #include <ClanLib/Display/Input/mouse.h>
 #include <ClanLib/Display/Display/display.h>
 #include "../pingus_resource.hxx"
+#include "../fonts.hxx"
 #include "editor_view.hxx"
 #include "status_line.hxx"
 #include "editorobj.hxx"
@@ -31,7 +32,7 @@
 
 StatusLine::StatusLine()
 {
-  font = PingusResource::load_font("Fonts/courier_small", "fonts");
+  font = Fonts::courier_small;
 }
 
 StatusLine::~StatusLine()

Index: string_reader.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/string_reader.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- string_reader.cxx   19 Apr 2003 10:23:18 -0000      1.8
+++ string_reader.cxx   22 Apr 2003 16:40:41 -0000      1.9
@@ -23,12 +23,13 @@
 #include <ClanLib/Display/Font/font.h>
 #include "../console.hxx"
 #include "../pingus_resource.hxx"
+#include "../fonts.hxx"
 #include "string_reader.hxx"
 
 StringReader::StringReader()
 {
   strings = 0;
-  font = PingusResource::load_font("Fonts/courier_small", "fonts");
+  font = Fonts::courier_small;
 }
 
 StringReader::StringReader(const std::string & d, const std::string & def)
@@ -36,7 +37,7 @@
   strings = 0;
   description = d;
   default_string = def;
-  font =  PingusResource::load_font("Fonts/courier_small", "fonts");
+  font = Fonts::courier_small;
 }
 
 StringReader::~StringReader()

Index: surface_selector.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/surface_selector.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- surface_selector.cxx        19 Apr 2003 10:23:18 -0000      1.8
+++ surface_selector.cxx        22 Apr 2003 16:40:41 -0000      1.9
@@ -22,11 +22,12 @@
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Input/mouse.h>
 #include "../gui/display.hxx"
+#include "../fonts.hxx"
 #include "../pingus_resource.hxx"
 #include "surface_selector.hxx"
 
 SurfaceSelector::SurfaceSelector (std::vector<surface_obj>* s)
-  : font(PingusResource::load_font("Fonts/courier_small", "fonts")),
+  : font(Fonts::courier_small),
     sur_list(s),
     y_of(0),
     width(CL_Display::get_width() - (CL_Display::get_width() % 50)),