[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3015 - in branches/pingus_sdl: . data/images/fonts src src
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r3015 - in branches/pingus_sdl: . data/images/fonts src src/gui src/input src/lisp src/worldmap src/worldobjs |
|
Date: |
Thu, 23 Aug 2007 18:01:21 +0200 |
Author: grumbel
Date: 2007-08-23 18:01:18 +0200 (Thu, 23 Aug 2007)
New Revision: 3015
Modified:
branches/pingus_sdl/INSTALL.unix
branches/pingus_sdl/TODO
branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-1.font
branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-2.font
branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-9.font
branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-1.font
branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-2.font
branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-9.font
branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-1.font
branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-2.font
branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-9.font
branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font
branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.font
branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.font
branches/pingus_sdl/data/images/fonts/lcd.font
branches/pingus_sdl/data/images/fonts/pingus-iso-8859-1.font
branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.font
branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.font
branches/pingus_sdl/data/images/fonts/pingus_large.font
branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font
branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.font
branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.font
branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-1.font
branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-2.font
branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-9.font
branches/pingus_sdl/data/images/fonts/reference-iso-8859-1.font
branches/pingus_sdl/src/SConscript
branches/pingus_sdl/src/file_reader.cpp
branches/pingus_sdl/src/font.cpp
branches/pingus_sdl/src/font_description.cpp
branches/pingus_sdl/src/globals.cpp
branches/pingus_sdl/src/gui/screen_manager.cpp
branches/pingus_sdl/src/input/controller.cpp
branches/pingus_sdl/src/lisp/parser.cpp
branches/pingus_sdl/src/path_manager.cpp
branches/pingus_sdl/src/pingus_level.cpp
branches/pingus_sdl/src/pingus_main.cpp
branches/pingus_sdl/src/pingus_menu.cpp
branches/pingus_sdl/src/pixel_buffer.cpp
branches/pingus_sdl/src/plf_res_mgr.cpp
branches/pingus_sdl/src/resource.cpp
branches/pingus_sdl/src/savegame_manager.cpp
branches/pingus_sdl/src/sprite.cpp
branches/pingus_sdl/src/sprite_description.hpp
branches/pingus_sdl/src/stat_manager.cpp
branches/pingus_sdl/src/worldmap/worldmap.cpp
branches/pingus_sdl/src/worldobjs/surface_background.cpp
Log:
- fixed file handling (well, mostly a cascade of workarounds)
- removed PhysFS from the requirements for now
Modified: branches/pingus_sdl/INSTALL.unix
===================================================================
--- branches/pingus_sdl/INSTALL.unix 2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/INSTALL.unix 2007-08-23 16:01:18 UTC (rev 3015)
@@ -9,7 +9,6 @@
SDL_mixer
SDL_image
boost - http://www.boost.org
- PhysicsFS - http://icculus.org/physfs/
libpng - http://libpng.org/
scons - http://scons.org/
Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO 2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/TODO 2007-08-23 16:01:18 UTC (rev 3015)
@@ -58,24 +58,18 @@
Important:
==========
-- grep for all the FIXME's and '#if 0' and find those that might be
- important, add what you find to this TODO
+- update INSTALL.Win32 file
-- update INSTALL.* file
+Nice to Have:
+=============
-- remove all the remaining unneeded debuging std::cout's
-
-- disable demo-writing per default
-
- bridging gets more complicated has graphical error (background?!)
surface background doesn't handle larger res due to the Playfield being
offsetted
-- there seems to be a bug in the sprite class causing a double-free,
- stuff broke in revision 2938 only got that as bug report, couldn't
- reproduce it myself
+- rapidly clicking the credits button causes the game to crash
-Nice to Have:
-=============
+- grep for all the FIXME's and '#if 0' and find those that might be
+ important, add what you find to this TODO
- jumper dies sometimes in data/levels/tutorial/snow11-grumbel.scm when
hitting the ground
Modified: branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-1.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-1.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/chalk_large-iso-8859-1.png"))
+ (image "images/fonts/chalk_large-iso-8859-1.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-2.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-2.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/chalk_large-iso-8859-2.png"))
+ (image "images/fonts/chalk_large-iso-8859-2.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-9.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-9.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/chalk_large-iso-8859-9.png"))
+ (image "images/fonts/chalk_large-iso-8859-9.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-1.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-1.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -8,6 +8,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/chalk_normal-iso-8859-1.png"))
+ (image "images/fonts/chalk_normal-iso-8859-1.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-2.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-2.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/chalk_normal-iso-8859-2.png"))
+ (image "images/fonts/chalk_normal-iso-8859-2.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-9.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-9.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/chalk_normal-iso-8859-9.png"))
+ (image "images/fonts/chalk_normal-iso-8859-9.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-1.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-1.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/chalk_small-iso-8859-1.png"))
+ (image "images/fonts/chalk_small-iso-8859-1.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-2.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-2.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/chalk_small-iso-8859-2.png"))
+ (image "images/fonts/chalk_small-iso-8859-2.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-9.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-9.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/chalk_small-iso-8859-9.png"))
+ (image "images/fonts/chalk_small-iso-8859-9.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -9,6 +9,6 @@
"���������������") ;; FIXME: Are those last few chars even latin1?
;; anyway, font needs to be redone or removed,
;; but this workaround will do for now
- (image "data/images/fonts/courier_small2.png"))
+ (image "images/fonts/courier_small2.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/courier_small-iso-8859-2.png"))
+ (image "images/fonts/courier_small-iso-8859-2.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/courier_small-iso-8859-9.png"))
+ (image "images/fonts/courier_small-iso-8859-9.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/lcd.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/lcd.font 2007-08-23 02:06:53 UTC
(rev 3014)
+++ branches/pingus_sdl/data/images/fonts/lcd.font 2007-08-23 16:01:18 UTC
(rev 3015)
@@ -6,6 +6,6 @@
(space-length 9)
(alpha-threshold 0)
(characters "0123456789:")
- (image "data/images/fonts/lcd.png"))
+ (image "images/fonts/lcd.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/pingus-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus-iso-8859-1.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/pingus-iso-8859-1.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus-iso-8859-1.png"))
+ (image "images/fonts/pingus-iso-8859-1.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus-iso-8859-2.png"))
+ (image "images/fonts/pingus-iso-8859-2.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus-iso-8859-9.png"))
+ (image "images/fonts/pingus-iso-8859-9.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/pingus_large.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_large.font 2007-08-23
02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/pingus_large.font 2007-08-23
16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"���������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_large.png"))
+ (image "images/fonts/pingus_large.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -8,6 +8,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_small-iso-8859-1.png"))
+ (image "images/fonts/pingus_small-iso-8859-1.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -7,6 +7,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_small-iso-8859-2.png"))
+ (image "images/fonts/pingus_small-iso-8859-2.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -7,6 +7,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_small-iso-8859-9.png"))
+ (image "images/fonts/pingus_small-iso-8859-9.png"))
;; EOF ;;
Modified:
branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-1.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-1.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -8,6 +8,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_small-iso-8859-1.png"))
+ (image "images/fonts/pingus_small-iso-8859-1.png"))
;; EOF ;;
Modified:
branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-2.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-2.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_small-iso-8859-2.png"))
+ (image "images/fonts/pingus_small-iso-8859-2.png"))
;; EOF ;;
Modified:
branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-9.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-9.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_small-iso-8859-9.png"))
+ (image "images/fonts/pingus_small-iso-8859-9.png"))
;; EOF ;;
Modified: branches/pingus_sdl/data/images/fonts/reference-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/reference-iso-8859-1.font
2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/data/images/fonts/reference-iso-8859-1.font
2007-08-23 16:01:18 UTC (rev 3015)
@@ -6,6 +6,6 @@
(characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/reference-iso-8859-1.png"))
+ (image "images/fonts/reference-iso-8859-1.png"))
;; EOF ;;
Modified: branches/pingus_sdl/src/SConscript
===================================================================
--- branches/pingus_sdl/src/SConscript 2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/src/SConscript 2007-08-23 16:01:18 UTC (rev 3015)
@@ -23,10 +23,11 @@
env = Environment(# ENV = {'PKG_CONFIG_PATH' : os.getenv('PKG_CONFIG_PATH')},
CC = 'gcc',
CCFLAGS = ['-O2', '-Wall', '-Werror', '-g'],
+ CPPDEFINES = ['ENABLE_BINRELOC'],
CPPPATH = ['..', '.'])
env.ParseConfig('sdl-config --cflags --libs')
-env['LIBS'] += ['SDL_image', 'SDL_mixer', 'physfs', 'png']
+env['LIBS'] += ['SDL_image', 'SDL_mixer', 'png']
env.Program('../pingus', [
@@ -228,8 +229,8 @@
'math/vector2f.cpp',
'math/vector2i.cpp',
'math/vector3f.cpp',
-'physfs/physfs_sdl.cpp',
-'physfs/physfs_stream.cpp',
+# 'physfs/physfs_sdl.cpp',
+# 'physfs/physfs_stream.cpp',
'world.cpp',
'worldmap/dot.cpp',
@@ -276,6 +277,7 @@
'worldobjs/teleporter_target.cpp',
'worldobjs/thunderstorm_background.cpp',
'worldobjs/woodthing.cpp',
+'../lib/binreloc/binreloc.c'
])
## EOF ##
Modified: branches/pingus_sdl/src/file_reader.cpp
===================================================================
--- branches/pingus_sdl/src/file_reader.cpp 2007-08-23 02:06:53 UTC (rev
3014)
+++ branches/pingus_sdl/src/file_reader.cpp 2007-08-23 16:01:18 UTC (rev
3015)
@@ -20,6 +20,7 @@
#include "sexpr_file_reader.hpp"
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"
+#include "path_manager.hpp"
#include "file_reader.hpp"
#include "file_reader_impl.hpp"
Modified: branches/pingus_sdl/src/font.cpp
===================================================================
--- branches/pingus_sdl/src/font.cpp 2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/src/font.cpp 2007-08-23 16:01:18 UTC (rev 3015)
@@ -24,6 +24,7 @@
#include "font.hpp"
#include "line_iterator.hpp"
#include "font_description.hpp"
+#include "path_manager.hpp"
#include "gui/display.hpp"
static bool vline_empty(SDL_Surface* surface, int x, Uint8 threshold)
@@ -65,9 +66,12 @@
for(int i = 0; i < 256; ++i)
chrs[i].x = chrs[i].y = chrs[i].w = chrs[i].h = 0;
- surface = IMG_Load(desc.image.c_str());
- //std::cout << "IMG: " << desc.image << std::endl;
- assert(surface);
+ surface = IMG_Load(path_manager.complete(desc.image).c_str());
+ if (!surface)
+ {
+ std::cout << "IMG: " << path_manager.complete(desc.image) << std::endl;
+ assert(surface);
+ }
vertical_spacing = (desc.vertical_spacing == -1) ? surface->h :
desc.vertical_spacing;
Modified: branches/pingus_sdl/src/font_description.cpp
===================================================================
--- branches/pingus_sdl/src/font_description.cpp 2007-08-23 02:06:53 UTC
(rev 3014)
+++ branches/pingus_sdl/src/font_description.cpp 2007-08-23 16:01:18 UTC
(rev 3015)
@@ -19,6 +19,7 @@
#include "pingus_error.hpp"
#include "file_reader.hpp"
+#include "path_manager.hpp"
#include "font_description.hpp"
FontDescription::FontDescription(const std::string& filename_)
@@ -31,7 +32,7 @@
char_spacing = 1.0f;
vertical_spacing = -1.0f;
- FileReader reader = FileReader::parse(filename);
+ FileReader reader = FileReader::parse(path_manager.complete(filename));
if (reader.get_name() != "pingus-font")
{
Modified: branches/pingus_sdl/src/globals.cpp
===================================================================
--- branches/pingus_sdl/src/globals.cpp 2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/src/globals.cpp 2007-08-23 16:01:18 UTC (rev 3015)
@@ -25,7 +25,7 @@
int verbose = 0;
bool music_enabled = true;
bool sound_enabled = true;
-bool enable_demo_recording = true;
+bool enable_demo_recording = false;
bool play_demo = false;
bool cursor_enabled = false;
bool fast_mode = false;
Modified: branches/pingus_sdl/src/gui/screen_manager.cpp
===================================================================
--- branches/pingus_sdl/src/gui/screen_manager.cpp 2007-08-23 02:06:53 UTC
(rev 3014)
+++ branches/pingus_sdl/src/gui/screen_manager.cpp 2007-08-23 16:01:18 UTC
(rev 3015)
@@ -49,7 +49,7 @@
Input::Controller* input_controller = 0;
if (controller_file.empty())
- input_controller = new
Input::Controller(path_manager.complete("controller/default.scm"));
+ input_controller = new Input::Controller("controller/default.scm");
else
input_controller = new Input::Controller(controller_file);
Input::Controller::set_current(input_controller);
Modified: branches/pingus_sdl/src/input/controller.cpp
===================================================================
--- branches/pingus_sdl/src/input/controller.cpp 2007-08-23 02:06:53 UTC
(rev 3014)
+++ branches/pingus_sdl/src/input/controller.cpp 2007-08-23 16:01:18 UTC
(rev 3015)
@@ -23,6 +23,7 @@
#include "../debug.hpp"
#include "../pingus_error.hpp"
+#include "path_manager.hpp"
#include "controller.hpp"
#include "axes/dummy_axis.hpp"
#include "buttons/dummy_button.hpp"
@@ -53,7 +54,7 @@
std_pointer_x(0),
std_pointer_y(0)
{
- FileReader reader = FileReader::parse(configfile);
+ FileReader reader = FileReader::parse(path_manager.complete(configfile));
if (reader.get_name() != "pingus-controller")
{
PingusError::raise("Controller: invalid config file <" + configfile +
">");
Modified: branches/pingus_sdl/src/lisp/parser.cpp
===================================================================
--- branches/pingus_sdl/src/lisp/parser.cpp 2007-08-23 02:06:53 UTC (rev
3014)
+++ branches/pingus_sdl/src/lisp/parser.cpp 2007-08-23 16:01:18 UTC (rev
3015)
@@ -23,6 +23,7 @@
#include <cassert>
#include <iostream>
#include <string>
+#include <fstream>
#include <exception>
#include "physfs/physfs_stream.hpp"
@@ -67,7 +68,7 @@
boost::shared_ptr<Lisp>
Parser::parse(const std::string& filename)
{
- IFileStream in(filename);
+ std::ifstream in(filename.c_str()); // FIXME: Temporary switched away from
physfs IFileStream
if(!in.good()) {
std::stringstream msg;
msg << "Parser problem: Couldn't open file '" << filename << "'.";
Modified: branches/pingus_sdl/src/path_manager.cpp
===================================================================
--- branches/pingus_sdl/src/path_manager.cpp 2007-08-23 02:06:53 UTC (rev
3014)
+++ branches/pingus_sdl/src/path_manager.cpp 2007-08-23 16:01:18 UTC (rev
3015)
@@ -51,10 +51,12 @@
}
bool
-PathManager::find_path (const std::list<std::string>& file_list)
+PathManager::find_path(const std::list<std::string>& file_list)
{
for (PathIter i = path_list.begin (); !path_found && i != path_list.end ();
++i)
{
+ pout(PINGUS_DEBUG_PATHMGR) << "PathManager: Checking: " << *i <<
std::endl;
+
bool found_file = true;
for (PathIter f = file_list.begin (); found_file && f != file_list.end
(); ++f)
{
Modified: branches/pingus_sdl/src/pingus_level.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_level.cpp 2007-08-23 02:06:53 UTC (rev
3014)
+++ branches/pingus_sdl/src/pingus_level.cpp 2007-08-23 16:01:18 UTC (rev
3015)
@@ -23,6 +23,7 @@
#include "pingus_error.hpp"
#include "pingus_level_impl.hpp"
#include "globals.hpp"
+#include "path_manager.hpp"
#include "debug.hpp"
PingusLevel::PingusLevel()
@@ -36,7 +37,7 @@
: impl(new PingusLevelImpl())
{
impl->resname = resname;
- FileReader reader = FileReader::parse(filename);
+ FileReader reader = FileReader::parse(path_manager.complete(filename));
if (reader.get_name() != "pingus-level")
{
Modified: branches/pingus_sdl/src/pingus_main.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_main.cpp 2007-08-23 02:06:53 UTC (rev
3014)
+++ branches/pingus_sdl/src/pingus_main.cpp 2007-08-23 16:01:18 UTC (rev
3015)
@@ -37,12 +37,9 @@
#include "SDL.h"
-//#include <ClanLib/display.h>
-//#include <ClanLib/sound.h>
-//#include <ClanLib/core.h>
-//#include <ClanLib/sdl.h>
-//#include <ClanLib/gl.h>
-//#include <ClanLib/gui.h>
+#ifdef ENABLE_BINRELOC
+#include "../lib/binreloc/binreloc.h"
+#endif
#include "gettext.h"
#include "tinygettext/dictionary_manager.hpp"
@@ -211,10 +208,13 @@
_("Displays this help"));
argp.add_option('n', "disable-intro", "",
_("Disable intro"));
+
+#if 0
argp.add_option('G', "use-opengl", "",
_("Use OpenGL"));
argp.add_option('S', "use-sdl", "",
_("Use SDL"));
+#endif
argp.add_option('w', "window", "",
_("Start in Window Mode"));
argp.add_option('f', "fullscreen", "",
@@ -601,7 +601,7 @@
std::cout << "Directory name of " << executable_name << " - " <<
System::dirname(executable_name)
<< std::endl;
-#ifdef __APPLE__
+#if defined(__APPLE__)
char resource_path[PATH_MAX];
CFURLRef ref = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
if (!ref || !CFURLGetFileSystemRepresentation(ref, true,
(UInt8*)resource_path, PATH_MAX))
@@ -612,19 +612,31 @@
CFRelease(ref);
path_manager.add_path("data");
//path_manager.add_path(CL_String::get_path(std::string(resource_path) +
"/data/"));
+#elif ENABLE_BINRELOC
+ path_manager.add_path("data");
+
+ BrInitError error;
+ if (br_init (&error) == 0 && error != BR_INIT_ERROR_DISABLED)
+ {
+ std::cout << "Warning: BinReloc failed to initialize (error code " <<
error << ")" << std::endl;
+ std::cout << "Will fallback to hardcoded default path." << std::endl;
+ }
+
+ std::string data_path = br_find_prefix("data");
+ data_path += "/share/games/pingus/data/";
+ //std::cout << "DataPath: " << data_path << std::endl;
+ path_manager.add_path(data_path);
+ path_manager.add_path("data");
#else
path_manager.add_path("data");
- //path_manager.add_path(CL_String::get_path(CL_System::get_exe_path() +
"/data/"));
- //path_manager.add_path(CL_String::get_path(CL_System::get_exe_path() +
"/../data/"));
- //path_manager.add_path(CL_String::get_path(CL_System::get_exe_path() +
"/../share/games/pingus/"));
#endif
std::list<std::string> file_list;
- file_list.push_back ("data/core.xml");
+ file_list.push_back ("data/core.res");
if (!path_manager.find_path (file_list))
{
- std::cout << "Error: Couldn't find 'data/core.xml', please set the
enviroment variable\n"
+ std::cout << "Error: Couldn't find 'data/core.res', please set the
enviroment variable\n"
<< "PINGUS_DATADIR to the path of the file `data/core.scr' or
use the\n"
<< "-d option." << std::endl;
exit(EXIT_FAILURE);
@@ -651,6 +663,7 @@
std::cout.put('=');
std::cout << std::endl;
+ std::cout << "data path: " << path_manager.get_base_path() <<
std::endl;
std::cout << "language: " <<
dictionary_manager.get_dictionary().get_language().name << std::endl;
Fonts::encoding =
StringUtil::to_lower(dictionary_manager.get_dictionary().get_charset());
@@ -805,11 +818,13 @@
{
init_path_finder();
+#if 0
PHYSFS_init(argv[0]);
PHYSFS_addToSearchPath("data", 0);
PHYSFS_addToSearchPath(".", 0);
PHYSFS_addToSearchPath(System::get_statdir().c_str(), 0);
PHYSFS_setWriteDir(System::get_statdir().c_str());
+#endif
quick_check_args(argc, argv);
read_rc_file();
@@ -849,7 +864,9 @@
deinit_pingus();
+#if 0
PHYSFS_deinit();
+#endif
return 0;
}
Modified: branches/pingus_sdl/src/pingus_menu.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_menu.cpp 2007-08-23 02:06:53 UTC (rev
3014)
+++ branches/pingus_sdl/src/pingus_menu.cpp 2007-08-23 16:01:18 UTC (rev
3015)
@@ -277,7 +277,7 @@
#ifdef NEW_MENU
setup_game_menu();
#else
- do_start("data/worldmaps/tutorial.worldmap");
+ do_start("worldmaps/tutorial.worldmap");
#endif
}
else if (button == quit_button)
Modified: branches/pingus_sdl/src/pixel_buffer.cpp
===================================================================
--- branches/pingus_sdl/src/pixel_buffer.cpp 2007-08-23 02:06:53 UTC (rev
3014)
+++ branches/pingus_sdl/src/pixel_buffer.cpp 2007-08-23 16:01:18 UTC (rev
3015)
@@ -20,6 +20,7 @@
#include "SDL_image.h"
#include <sstream>
#include <iostream>
+#include "path_manager.hpp"
#include "pixel_buffer.hpp"
class PixelBufferImpl
@@ -39,7 +40,7 @@
PixelBuffer::PixelBuffer(const std::string& name_)
: impl(new PixelBufferImpl())
{
- impl->surface = IMG_Load(name_.c_str());
+ impl->surface = IMG_Load(path_manager.complete(name_).c_str());
if (!impl->surface)
std::cout << "XXXXXX Failed to load: " << name_ << std::endl;
///else
Modified: branches/pingus_sdl/src/plf_res_mgr.cpp
===================================================================
--- branches/pingus_sdl/src/plf_res_mgr.cpp 2007-08-23 02:06:53 UTC (rev
3014)
+++ branches/pingus_sdl/src/plf_res_mgr.cpp 2007-08-23 16:01:18 UTC (rev
3015)
@@ -95,7 +95,7 @@
PingusLevel
PLFResMgr::load_plf(const std::string& res_name)
{
- return load_plf_raw(res_name, path_manager.complete("levels/" + res_name +
".pingus"));
+ return load_plf_raw(res_name, "levels/" + res_name + ".pingus");
}
Modified: branches/pingus_sdl/src/resource.cpp
===================================================================
--- branches/pingus_sdl/src/resource.cpp 2007-08-23 02:06:53 UTC (rev
3014)
+++ branches/pingus_sdl/src/resource.cpp 2007-08-23 16:01:18 UTC (rev
3015)
@@ -307,7 +307,7 @@
Font
Resource::load_font(const std::string& res_name)
{
- FontDescription desc("data/images/" + res_name + ".font");
+ FontDescription desc("images/" + res_name + ".font");
//("data/images/fonts/chalk_large-iso-8859-1.font");
return Font(desc);
}
Modified: branches/pingus_sdl/src/savegame_manager.cpp
===================================================================
--- branches/pingus_sdl/src/savegame_manager.cpp 2007-08-23 02:06:53 UTC
(rev 3014)
+++ branches/pingus_sdl/src/savegame_manager.cpp 2007-08-23 16:01:18 UTC
(rev 3015)
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <assert.h>
+#include <fstream>
#include "system.hpp"
#include "pingus_error.hpp"
#include "sexpr_file_reader.hpp"
@@ -25,9 +26,7 @@
#include "savegame_manager.hpp"
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
-#include "physfs/physfs_stream.hpp"
-
SavegameManager* SavegameManager::instance_ = 0;
SavegameManager*
@@ -46,12 +45,12 @@
}
SavegameManager::SavegameManager(const std::string& arg_filename)
- : filename(arg_filename)
+ : filename(System::get_statdir() + arg_filename)
{
boost::shared_ptr<lisp::Lisp> sexpr;
try {
- sexpr = lisp::Parser::parse(arg_filename);
+ sexpr = lisp::Parser::parse(filename);
}
catch (const std::runtime_error& e) {
std::cerr << "SavegameManager: " << e.what() << std::endl;
@@ -141,7 +140,7 @@
void
SavegameManager::flush()
{
- OFileStream out(filename);
+ std::ofstream out(filename.c_str());
SExprFileWriter sfw(out);
sfw.begin_section("pingus-savegame");
Modified: branches/pingus_sdl/src/sprite.cpp
===================================================================
--- branches/pingus_sdl/src/sprite.cpp 2007-08-23 02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/src/sprite.cpp 2007-08-23 16:01:18 UTC (rev 3015)
@@ -27,6 +27,7 @@
#include "sprite.hpp"
#include "blitter.hpp"
#include "pixel_buffer.hpp"
+#include "path_manager.hpp"
#include "sprite_description.hpp"
class SpriteImpl
@@ -63,11 +64,11 @@
frame(0),
tick_count(0)
{
- surface = IMG_Load(desc.filename.c_str());
+ surface = IMG_Load(path_manager.complete(desc.filename).c_str());
if (!surface)
{
std::cout << "Error: Couldn't load " << desc.filename << std::endl;
- surface = IMG_Load("data/images/core/misc/404.png");
+ surface =
IMG_Load(path_manager.complete("images/core/misc/404.png").c_str());
assert(surface);
}
@@ -308,7 +309,7 @@
{
if (impl->frame_size.width != w || impl->frame_size.height != h)
{
- boost::shared_ptr<SpriteImpl> new_impl(new SpriteImpl());
+ boost::shared_ptr<SpriteImpl> new_impl(new SpriteImpl());
if ((impl->frame_size.width * impl->array.width) == impl->surface->w
&&
(impl->frame_size.height * impl->array.height) == impl->surface->h)
Modified: branches/pingus_sdl/src/sprite_description.hpp
===================================================================
--- branches/pingus_sdl/src/sprite_description.hpp 2007-08-23 02:06:53 UTC
(rev 3014)
+++ branches/pingus_sdl/src/sprite_description.hpp 2007-08-23 16:01:18 UTC
(rev 3015)
@@ -61,7 +61,7 @@
reader.read_enum("origin", origin, string2origin);
reader.read_string("image-file", filename);
- filename = "data/data/" + filename;// FIXME: Hack
+ filename = "data/" + filename; // FIXME: Hack
reader.read_size("image-array", array);
reader.read_vector2i("image-pos", frame_pos);
reader.read_size("image-size", frame_size);
Modified: branches/pingus_sdl/src/stat_manager.cpp
===================================================================
--- branches/pingus_sdl/src/stat_manager.cpp 2007-08-23 02:06:53 UTC (rev
3014)
+++ branches/pingus_sdl/src/stat_manager.cpp 2007-08-23 16:01:18 UTC (rev
3015)
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <algorithm>
+#include <fstream>
#include "system.hpp"
#include "pingus_error.hpp"
#include "string_util.hpp"
@@ -26,9 +27,7 @@
#include "sexpr_file_writer.hpp"
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
-#include "physfs/physfs_stream.hpp"
-
StatManager* StatManager::instance_ = 0;
StatManager*
@@ -71,7 +70,7 @@
}
StatManager::StatManager(const std::string& arg_filename)
- : statfilename(arg_filename)
+ : statfilename(System::get_statdir() + arg_filename)
{
load(statfilename);
}
@@ -83,7 +82,7 @@
void
StatManager::load(const std::string& filename)
{
- if (!PHYSFS_exists(filename.c_str()))
+ if (!System::exist(filename.c_str()))
{
// Create empty file
save(filename);
@@ -128,7 +127,7 @@
void
StatManager::save(const std::string& filename)
{
- OFileStream out(filename);
+ std::ofstream out(filename.c_str());
SExprFileWriter writer(out);
writer.begin_section("pingus-stats");
Modified: branches/pingus_sdl/src/worldmap/worldmap.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/worldmap.cpp 2007-08-23 02:06:53 UTC
(rev 3014)
+++ branches/pingus_sdl/src/worldmap/worldmap.cpp 2007-08-23 16:01:18 UTC
(rev 3015)
@@ -58,7 +58,7 @@
mouse_x(0),
mouse_y(0)
{
- parse_file(FileReader::parse(filename));
+ parse_file(FileReader::parse(path_manager.complete(filename)));
pingus = new Pingus(path_graph);
set_starting_node();
Modified: branches/pingus_sdl/src/worldobjs/surface_background.cpp
===================================================================
--- branches/pingus_sdl/src/worldobjs/surface_background.cpp 2007-08-23
02:06:53 UTC (rev 3014)
+++ branches/pingus_sdl/src/worldobjs/surface_background.cpp 2007-08-23
16:01:18 UTC (rev 3015)
@@ -174,7 +174,8 @@
x < world->get_width();
x += bg_surface.get_width())
{
- gc.color().draw(bg_surface, Vector3f(x - offset.x, y -
offset.y, pos.z));
+ gc.color().draw(bg_surface, Vector3f(x - offset.x,
+ y - offset.y, pos.z));
}
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3015 - in branches/pingus_sdl: . data/images/fonts src src/gui src/input src/lisp src/worldmap src/worldobjs,
grumbel at BerliOS <=