[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2652 - in branches/pingus_sdl: . data/data src src/math
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r2652 - in branches/pingus_sdl: . data/data src src/math |
|
Date: |
Mon, 15 Jan 2007 00:59:46 +0100 |
Author: grumbel
Date: 2007-01-15 00:59:43 +0100 (Mon, 15 Jan 2007)
New Revision: 2652
Modified:
branches/pingus_sdl/clanlib_2_sexpr.rb
branches/pingus_sdl/data/data/alias.res
branches/pingus_sdl/data/data/core.res
branches/pingus_sdl/data/data/entrances.res
branches/pingus_sdl/data/data/exits.res
branches/pingus_sdl/data/data/game.res
branches/pingus_sdl/data/data/groundpieces-bridge.res
branches/pingus_sdl/data/data/groundpieces-ground.res
branches/pingus_sdl/data/data/groundpieces-remove.res
branches/pingus_sdl/data/data/groundpieces-solid.res
branches/pingus_sdl/data/data/groundpieces-transparent.res
branches/pingus_sdl/data/data/hotspots.res
branches/pingus_sdl/data/data/liquids.res
branches/pingus_sdl/data/data/particles.res
branches/pingus_sdl/data/data/pingus-common.res
branches/pingus_sdl/data/data/pingus-player0.res
branches/pingus_sdl/data/data/pingus-player1.res
branches/pingus_sdl/data/data/pingus-player2.res
branches/pingus_sdl/data/data/pingus-player3.res
branches/pingus_sdl/data/data/story.res
branches/pingus_sdl/data/data/textures.res
branches/pingus_sdl/data/data/traps.res
branches/pingus_sdl/data/data/worldmaps.res
branches/pingus_sdl/data/data/worldobjs.res
branches/pingus_sdl/src/SConscript
branches/pingus_sdl/src/file_reader.cxx
branches/pingus_sdl/src/file_reader.hxx
branches/pingus_sdl/src/file_reader_impl.hxx
branches/pingus_sdl/src/math/vector2i.cpp
branches/pingus_sdl/src/origin.cpp
branches/pingus_sdl/src/origin.hpp
branches/pingus_sdl/src/resource.cxx
branches/pingus_sdl/src/resource_manager.cpp
branches/pingus_sdl/src/resource_manager.hpp
branches/pingus_sdl/src/sexpr_file_reader.cpp
branches/pingus_sdl/src/sprite.cpp
branches/pingus_sdl/src/sprite.hpp
Log:
- some more resource work
Modified: branches/pingus_sdl/clanlib_2_sexpr.rb
===================================================================
--- branches/pingus_sdl/clanlib_2_sexpr.rb 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/clanlib_2_sexpr.rb 2007-01-14 23:59:43 UTC (rev
2652)
@@ -18,22 +18,21 @@
case el.name
when "image"
if not el.has_elements? then
- print "\n#{prefix} (image (file \"#{el.attribute("file").value}\"))"
+ print "\n#{prefix} (image-file \"#{el.attribute("file").value}\")"
elsif el.elements["grid"] then
- print "\n#{prefix} (image (file \"#{el.attribute("file").value}\")"
+ print "\n#{prefix} (image-file \"#{el.attribute("file").value}\")"
if el.elements["grid"].attribute("array") then
- print "\n#{prefix} (array
#{el.elements["grid"].attribute("array").value.gsub(",", " ")})"
+ print "\n#{prefix} (image-array
#{el.elements["grid"].attribute("array").value.gsub(",", " ")})"
end
if el.elements["grid"].attribute("size") then
- print "\n#{prefix} (size
#{el.elements["grid"].attribute("size").value.gsub(",", " ")})"
+ print "\n#{prefix} (image-size
#{el.elements["grid"].attribute("size").value.gsub(",", " ")})"
end
if el.elements["grid"].attribute("pos") then
- print "\n#{prefix} (pos
#{el.elements["grid"].attribute("pos").value.gsub(",", " ")})"
+ print "\n#{prefix} (image-pos
#{el.elements["grid"].attribute("pos").value.gsub(",", " ")})"
end
- print ")"
else
puts "unknown font element: "
end
@@ -94,7 +93,7 @@
dir = File.dirname(arg)
doc = REXML::Document.new(File.new(arg))
doc.elements.each("resources") { |el|
- print ";; #{arg}\n(pingus-resource"
+ print ";; #{arg}\n(pingus-resources"
parse_section(" ", "", el)
puts " )"
}
Modified: branches/pingus_sdl/data/data/alias.res
===================================================================
--- branches/pingus_sdl/data/data/alias.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/alias.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -1,5 +1,6 @@
;; alias.xml
(pingus-resources
+ ;; Pre 0.6.0 Stuff
(alias (name "global/Buttons/pause")
(link "core/buttons/pause"))
@@ -1529,7 +1530,7 @@
(link "liquids/slime"))
;; same as above but with section names in lowercase, not sure why
- ;; this is needed, but some level contain identifers in that way
+;; this is needed, but some level contain identifers in that way
(alias (name "entrances/entrances/entrance")
(link "entrances/entrance"))
Modified: branches/pingus_sdl/data/data/core.res
===================================================================
--- branches/pingus_sdl/data/data/core.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/core.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -4,128 +4,128 @@
(section (name "cursors")
(sprite
(name "editor")
- (image (file "../images/core/cursors/editor.png")))
+ (image-file "../images/core/cursors/editor.png"))
(sprite
(name "cursor")
- (image (file "../images/core/cursors/cursor.png")))
+ (image-file "../images/core/cursors/cursor.png"))
(sprite
(name "scroll_cur")
(origin "center")
(offset 0 0)
- (image (file "../images/core/cursors/scroll.png")))
+ (image-file "../images/core/cursors/scroll.png"))
(sprite
(name "capgood")
- (image (file "../images/core/cursors/cap.png")))
+ (image-file "../images/core/cursors/cap.png"))
(sprite
(name "capbad")
- (image (file "../images/core/cursors/capwrong.png")))
+ (image-file "../images/core/cursors/capwrong.png"))
(sprite
(name "cross")
- (image (file "../images/core/cursors/cross.png")))
+ (image-file "../images/core/cursors/cross.png"))
(sprite
(name "arrow_right")
- (image (file "../images/core/cursors/arrow_right.png")))
+ (image-file "../images/core/cursors/arrow_right.png"))
(sprite
(name "arrow_left")
- (image (file "../images/core/cursors/arrow_left.png")))
+ (image-file "../images/core/cursors/arrow_left.png"))
(sprite
(name "animcross")
- (image (file "../images/core/cursors/animcross.png")
- (array 10 1)))
+ (image-file "../images/core/cursors/animcross.png")
+ (image-array 10 1))
)
(section (name "editor")
(sprite
(name "start_pos")
- (image (file "../images/core/editor/start_pos.png")))
+ (image-file "../images/core/editor/start_pos.png"))
(sprite
(name "weather_rain")
- (image (file "../images/core/editor/weather_rain.png")))
+ (image-file "../images/core/editor/weather_rain.png"))
(sprite
(name "weather_snow")
- (image (file "../images/core/editor/weather_snow.png")))
+ (image-file "../images/core/editor/weather_snow.png"))
(sprite
(name "copy")
- (image (file "../images/core/editor/tb_copy.png")))
+ (image-file "../images/core/editor/tb_copy.png"))
(sprite
(name "new")
- (image (file "../images/core/editor/tb_new.png")))
+ (image-file "../images/core/editor/tb_new.png"))
(sprite
(name "open")
- (image (file "../images/core/editor/tb_open.png")))
+ (image-file "../images/core/editor/tb_open.png"))
(sprite
(name "save")
- (image (file "../images/core/editor/tb_save.png")))
+ (image-file "../images/core/editor/tb_save.png"))
(sprite
(name "exit")
- (image (file "../images/core/editor/tb_exit.png")))
+ (image-file "../images/core/editor/tb_exit.png"))
(sprite
(name "clock_run")
- (image (file "../images/core/editor/tb_clock_run.png")))
+ (image-file "../images/core/editor/tb_clock_run.png"))
(sprite
(name "edit")
- (image (file "../images/core/editor/tb_edit.png")))
+ (image-file "../images/core/editor/tb_edit.png"))
(sprite
(name "preferences")
- (image (file "../images/core/editor/tb_preferences.png")))
+ (image-file "../images/core/editor/tb_preferences.png"))
(sprite
(name "help")
- (image (file "../images/core/editor/tb_help.png")))
+ (image-file "../images/core/editor/tb_help.png"))
(sprite
(name "delete")
- (image (file "../images/core/editor/tb_trash.png")))
+ (image-file "../images/core/editor/tb_trash.png"))
(sprite
(name "index")
- (image (file "../images/core/editor/tb_index.png")))
+ (image-file "../images/core/editor/tb_index.png"))
(sprite
(name "region-zoom")
- (image (file "../images/core/editor/region-zoom.png")))
+ (image-file "../images/core/editor/region-zoom.png"))
(sprite
(name "zoom-in")
- (image (file "../images/core/editor/zoom-in.png")))
+ (image-file "../images/core/editor/zoom-in.png"))
(sprite
(name "zoom-out")
- (image (file "../images/core/editor/zoom-out.png")))
+ (image-file "../images/core/editor/zoom-out.png"))
(sprite
(name "button")
- (image (file "../images/core/editor/button.png")))
+ (image-file "../images/core/editor/button.png"))
(sprite
(name "button_pressed")
- (image (file "../images/core/editor/button_pressed.png")))
+ (image-file "../images/core/editor/button_pressed.png"))
(sprite
(name "actions")
- (image (file "../images/core/editor/actions.png")))
+ (image-file "../images/core/editor/actions.png"))
(sprite
(name "logo")
- (image (file "../images/core/editor/logo.png")))
+ (image-file "../images/core/editor/logo.png"))
)
(section (name "buttons")
@@ -133,192 +133,192 @@
(name "info")
(origin "top_center")
(offset 0 0)
- (image (file "../images/core/buttons/info.png")))
+ (image-file "../images/core/buttons/info.png"))
(sprite
(name "hbuttonbg")
- (image (file "../images/core/buttons/hbuttonbg.png")))
+ (image-file "../images/core/buttons/hbuttonbg.png"))
(sprite
(name "hbuttonbgb")
- (image (file "../images/core/buttons/hbuttonbgb.png")))
+ (image-file "../images/core/buttons/hbuttonbgb.png"))
(sprite
(name "buttonbackground")
- (image (file "../images/core/buttons/buttonbackground.png")))
+ (image-file "../images/core/buttons/buttonbackground.png"))
(sprite
(name "buttonbackgroundhl")
- (image (file "../images/core/buttons/buttonbackgroundhl.png")))
+ (image-file "../images/core/buttons/buttonbackgroundhl.png"))
(sprite
(name "pause")
- (image (file "../images/core/buttons/pause.png")))
+ (image-file "../images/core/buttons/pause.png"))
(sprite
(name "fast_forward")
- (image (file "../images/core/buttons/fast_forward.png")))
+ (image-file "../images/core/buttons/fast_forward.png"))
(sprite
(name "armageddon_anim")
- (image (file "../images/core/buttons/armageddon_anim.png")
- (array 14 1)
- (size 36 57)
- (pos 0 0)))
+ (image-file "../images/core/buttons/armageddon_anim.png")
+ (image-array 14 1)
+ (image-size 36 57)
+ (image-pos 0 0))
)
(section (name "menu")
(sprite
(name "filedialog")
- (image (file "../images/core/menu/filedialog.png")))
+ (image-file "../images/core/menu/filedialog.png"))
(sprite
(name "folder")
- (image (file "../images/core/menu/folder.png")))
+ (image-file "../images/core/menu/folder.png"))
(sprite
(name "parent_folder")
- (image (file "../images/core/menu/parent_folder.png")))
+ (image-file "../images/core/menu/parent_folder.png"))
(sprite
(name "default_level")
- (image (file "../images/core/menu/default_level.jpg")))
+ (image-file "../images/core/menu/default_level.jpg"))
(sprite
(name "up_arrow")
- (image (file "../images/core/menu/up_arrow.png")))
+ (image-file "../images/core/menu/up_arrow.png"))
(sprite
(name "down_arrow")
- (image (file "../images/core/menu/down_arrow.png")))
+ (image-file "../images/core/menu/down_arrow.png"))
(sprite
(name "startscreenbg")
(origin "center")
(offset 0 0)
- (image (file "../images/core/menu/startscreenbg.jpg")))
+ (image-file "../images/core/menu/startscreenbg.jpg"))
(sprite
(name "create_on")
- (image (file "../images/core/menu/create_on.png")))
+ (image-file "../images/core/menu/create_on.png"))
(sprite
(name "credits_on")
- (image (file "../images/core/menu/credits_on.png")))
+ (image-file "../images/core/menu/credits_on.png"))
(sprite
(name "exit_on")
- (image (file "../images/core/menu/exit_on.png")))
+ (image-file "../images/core/menu/exit_on.png"))
(sprite
(name "options_on")
- (image (file "../images/core/menu/options_on.png")))
+ (image-file "../images/core/menu/options_on.png"))
(sprite
(name "play_on")
- (image (file "../images/core/menu/play_on.png")))
+ (image-file "../images/core/menu/play_on.png"))
(sprite
(name "multi_on")
- (image (file "../images/core/menu/multi_on.png")))
+ (image-file "../images/core/menu/multi_on.png"))
(sprite
(name "layer1")
- (image (file "../images/core/menu/layer1.png")))
+ (image-file "../images/core/menu/layer1.png"))
(sprite
(name "layer2")
- (image (file "../images/core/menu/layer2.png")))
+ (image-file "../images/core/menu/layer2.png"))
(sprite
(name "layer3")
- (image (file "../images/core/menu/layer3.png")))
+ (image-file "../images/core/menu/layer3.png"))
(sprite
(name "layer4")
- (image (file "../images/core/menu/layer4.png")))
+ (image-file "../images/core/menu/layer4.png"))
(sprite
(name "layer5")
- (image (file "../images/core/menu/layer5.png")))
+ (image-file "../images/core/menu/layer5.png"))
(sprite
(name "exit_button_normal")
- (image (file "../images/core/menu/exit_button_normal.png")))
+ (image-file "../images/core/menu/exit_button_normal.png"))
(sprite
(name "exit_button_hover")
- (image (file "../images/core/menu/exit_button_hover.png")))
+ (image-file "../images/core/menu/exit_button_hover.png"))
(sprite
(name "exit_button_pressed")
- (image (file "../images/core/menu/exit_button_pressed.png")))
+ (image-file "../images/core/menu/exit_button_pressed.png"))
(sprite
(name "exit_menu")
- (image (file "../images/core/menu/exit_menu.png")))
+ (image-file "../images/core/menu/exit_menu.png"))
)
(section (name "start")
(sprite
(name "ok")
- (image (file "../images/core/misc/start_ok.png")))
+ (image-file "../images/core/misc/start_ok.png"))
(sprite
(name "ok_hover")
- (image (file "../images/core/misc/start_ok_hover.png")))
+ (image-file "../images/core/misc/start_ok_hover.png"))
(sprite
(name "ok_clicked")
- (image (file "../images/core/misc/start_ok_clicked.png")))
+ (image-file "../images/core/misc/start_ok_clicked.png"))
(sprite
(name "back")
- (image (file "../images/core/misc/start_back.png")))
+ (image-file "../images/core/misc/start_back.png"))
(sprite
(name "back_hover")
- (image (file "../images/core/misc/start_back_hover.png")))
+ (image-file "../images/core/misc/start_back_hover.png"))
(sprite
(name "back_clicked")
- (image (file "../images/core/misc/start_back_clicked.png")))
+ (image-file "../images/core/misc/start_back_clicked.png"))
)
(section (name "misc")
(sprite
(name "checkbox_clicked")
- (image (file "../images/core/misc/checkbox_clicked.png")))
+ (image-file "../images/core/misc/checkbox_clicked.png"))
(sprite
(name "next")
- (image (file "../images/core/misc/next.png")))
+ (image-file "../images/core/misc/next.png"))
(sprite
(name "next_hover")
- (image (file "../images/core/misc/next_hover.png")))
+ (image-file "../images/core/misc/next_hover.png"))
(sprite
(name "chalk_pingu1")
- (image (file "../images/core/misc/chalk_pingu1.png")))
+ (image-file "../images/core/misc/chalk_pingu1.png"))
(sprite
(name "chalk_pingu2")
- (image (file "../images/core/misc/chalk_pingu2.png")))
+ (image-file "../images/core/misc/chalk_pingu2.png"))
(sprite
(name "chalk_pingu3")
- (image (file "../images/core/misc/chalk_pingu3.png")))
+ (image-file "../images/core/misc/chalk_pingu3.png"))
(sprite
(name "chalk_pingu4")
- (image (file "../images/core/misc/chalk_pingu4.png")))
+ (image-file "../images/core/misc/chalk_pingu4.png"))
(sprite
(name "flag0")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/core/misc/flag0.png")))
+ (image-file "../images/core/misc/flag0.png"))
(sprite
(name "404")
@@ -326,73 +326,74 @@
(sprite
(name "404sprite")
- (image (file "../images/core/misc/404.png")))
+ (image-file "../images/core/misc/404.png"))
(sprite
(name "logo")
- (image (file "../images/core/misc/logo.png")))
+ (origin "center")
+ (image-file "../images/core/misc/logo.png"))
(sprite
(name "loading")
- (image (file "../images/core/misc/loading.png")))
+ (image-file "../images/core/misc/loading.png"))
(sprite
(name "pingubw")
- (image (file "../images/core/misc/pingubw.png")))
+ (image-file "../images/core/misc/pingubw.png"))
(sprite
(name "creditpingu")
- (image (file "../images/core/misc/creditpingu.png")))
+ (image-file "../images/core/misc/creditpingu.png"))
(sprite
(name "smallmap_entrance")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/core/misc/smallmap_entrance.png")))
+ (image-file "../images/core/misc/smallmap_entrance.png"))
(sprite
(name "smallmap_exit")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/core/misc/smallmap_exit.png")))
+ (image-file "../images/core/misc/smallmap_exit.png"))
(sprite
(name "flag0")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/core/misc/flag0.png")))
+ (image-file "../images/core/misc/flag0.png"))
(sprite
(name "flag1")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/core/misc/flag1.png")))
+ (image-file "../images/core/misc/flag1.png"))
(sprite
(name "flag2")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/core/misc/flag2.png")))
+ (image-file "../images/core/misc/flag2.png"))
(sprite
(name "flag3")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/core/misc/flag3.png")))
+ (image-file "../images/core/misc/flag3.png"))
(sprite
(name "unplayable")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/core/misc/unplayable.png")))
+ (image-file "../images/core/misc/unplayable.png"))
(sprite
(name "unplayable2")
- (image (file "../images/core/misc/unplayable2.png")))
+ (image-file "../images/core/misc/unplayable2.png"))
(sprite
(name "infinity")
- (image (file "../images/core/misc/infinity.png")))
+ (image-file "../images/core/misc/infinity.png"))
)
(section (name "worldmap")
@@ -402,125 +403,125 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/core/worldmap/pingus.png")
- (array 8 1)
- (size 24 24)
- (pos 0 0)))
+ (image-file "../images/core/worldmap/pingus.png")
+ (image-array 8 1)
+ (image-size 24 24)
+ (image-pos 0 0))
(sprite
(name "right")
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/core/worldmap/pingus.png")
- (array 8 1)
- (size 24 24)
- (pos 0 24)))
+ (image-file "../images/core/worldmap/pingus.png")
+ (image-array 8 1)
+ (image-size 24 24)
+ (image-pos 0 24))
)
(sprite
(name "tube")
- (image (file "../images/core/worldmap/tube.png")))
+ (image-file "../images/core/worldmap/tube.png"))
(sprite
(name "dot_invalid")
(origin "center")
(offset 0 0)
- (image (file "../images/core/worldmap/dot_invalid.png")))
+ (image-file "../images/core/worldmap/dot_invalid.png"))
(sprite
(name "dot_green")
(origin "center")
(offset 0 0)
- (image (file "../images/core/worldmap/dot_green.png")))
+ (image-file "../images/core/worldmap/dot_green.png"))
(sprite
(name "dot_red")
(origin "center")
(offset 0 0)
- (image (file "../images/core/worldmap/dot_red.png")))
+ (image-file "../images/core/worldmap/dot_red.png"))
(sprite
(name "dot_green_hl")
(origin "center")
(offset 0 0)
- (image (file "../images/core/worldmap/dot_green_hl.png")))
+ (image-file "../images/core/worldmap/dot_green_hl.png"))
(sprite
(name "dot_red_hl")
(origin "center")
(offset 0 0)
- (image (file "../images/core/worldmap/dot_red_hl.png")))
+ (image-file "../images/core/worldmap/dot_red_hl.png"))
(sprite
(name "flaggreen")
(origin "center")
(offset 0 0)
- (image (file "../images/core/worldmap/flaggreen.png")))
+ (image-file "../images/core/worldmap/flaggreen.png"))
(sprite
(name "arrow")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/core/worldmap/arrow.png")))
+ (image-file "../images/core/worldmap/arrow.png"))
(sprite
(name "pingus_standing")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/core/worldmap/pingus_standing.png")))
+ (image-file "../images/core/worldmap/pingus_standing.png"))
(sprite
(name "levelname_bg")
- (image (file "../images/core/worldmap/levelname_bg.png")))
+ (image-file "../images/core/worldmap/levelname_bg.png"))
(sprite
(name "enter_button_normal")
- (image (file "../images/core/worldmap/enter_button_normal.png")))
+ (image-file "../images/core/worldmap/enter_button_normal.png"))
(sprite
(name "enter_button_hover")
- (image (file "../images/core/worldmap/enter_button_hover.png")))
+ (image-file "../images/core/worldmap/enter_button_hover.png"))
(sprite
(name "enter_button_pressed")
- (image (file "../images/core/worldmap/enter_button_pressed.png")))
+ (image-file "../images/core/worldmap/enter_button_pressed.png"))
(sprite
(name "leave_button_normal")
- (image (file "../images/core/worldmap/leave_button_normal.png")))
+ (image-file "../images/core/worldmap/leave_button_normal.png"))
(sprite
(name "leave_button_hover")
- (image (file "../images/core/worldmap/leave_button_hover.png")))
+ (image-file "../images/core/worldmap/leave_button_hover.png"))
(sprite
(name "leave_button_pressed")
- (image (file "../images/core/worldmap/leave_button_pressed.png")))
+ (image-file "../images/core/worldmap/leave_button_pressed.png"))
(sprite
(name "story_button_normal")
- (image (file "../images/core/worldmap/story_button_normal.png")))
+ (image-file "../images/core/worldmap/story_button_normal.png"))
(sprite
(name "story_button_hover")
- (image (file "../images/core/worldmap/story_button_hover.png")))
+ (image-file "../images/core/worldmap/story_button_hover.png"))
(sprite
(name "story_button_pressed")
- (image (file "../images/core/worldmap/story_button_pressed.png")))
+ (image-file "../images/core/worldmap/story_button_pressed.png"))
(sprite
(name "credits_button_normal")
- (image (file "../images/core/worldmap/credits_button_normal.png")))
+ (image-file "../images/core/worldmap/credits_button_normal.png"))
(sprite
(name "credits_button_hover")
- (image (file "../images/core/worldmap/credits_button_hover.png")))
+ (image-file "../images/core/worldmap/credits_button_hover.png"))
(sprite
(name "credits_button_pressed")
- (image (file "../images/core/worldmap/credits_button_pressed.png")))
+ (image-file "../images/core/worldmap/credits_button_pressed.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/entrances.res
===================================================================
--- branches/pingus_sdl/data/data/entrances.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/entrances.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -5,96 +5,96 @@
(name "entrance")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/entrance.png")))
+ (image-file "../images/entrances/entrance.png"))
(sprite
(name "generic")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/generic.png")))
+ (image-file "../images/entrances/generic.png"))
(sprite
(name "woodthing_nmov")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/woodthing_nmov.png")))
+ (image-file "../images/entrances/woodthing_nmov.png"))
(sprite
(name "woodthing_mov")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/woodthing_mov.png")
- (array 17 1)
- (size 105 17)
- (pos 0 0)))
+ (image-file "../images/entrances/woodthing_mov.png")
+ (image-array 17 1)
+ (image-size 105 17)
+ (image-pos 0 0))
(sprite
(name "cloud")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/cloudent.png")))
+ (image-file "../images/entrances/cloudent.png"))
(sprite
(name "space")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/space.png")
- (array 5 1)
- (size 62 64)
- (pos 0 0)))
+ (image-file "../images/entrances/space.png")
+ (image-array 5 1)
+ (image-size 62 64)
+ (image-pos 0 0))
(sprite
(name "wood_bottom")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/wood_bottom.png")))
+ (image-file "../images/entrances/wood_bottom.png"))
(sprite
(name "wood_top")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/wood_top.png")))
+ (image-file "../images/entrances/wood_top.png"))
(sprite
(name "entrance_eyes")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/eyes_entrance.png")))
+ (image-file "../images/entrances/eyes_entrance.png"))
(sprite
(name "entrance_eyes_anim")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/eyes_entrance_anim.png")
- (array 7 1)
- (size 166 72)
- (pos 0 0)))
+ (image-file "../images/entrances/eyes_entrance_anim.png")
+ (image-array 7 1)
+ (image-size 166 72)
+ (image-pos 0 0))
(sprite
(name "underlay_eyes")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/eyes_underlay.png")))
+ (image-file "../images/entrances/eyes_underlay.png"))
(sprite
(name "industrial")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/industrial.png")))
+ (image-file "../images/entrances/industrial.png"))
(sprite
(name "industrial_top")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/entrances/industrial_top.png")))
+ (image-file "../images/entrances/industrial_top.png"))
(sprite
(name "snow_front")
- (image (file "../images/entrances/snow_front.png")))
+ (image-file "../images/entrances/snow_front.png"))
(sprite
(name "snow_back")
- (image (file "../images/entrances/snow_back.png")))
+ (image-file "../images/entrances/snow_back.png"))
)
)
Modified: branches/pingus_sdl/data/data/exits.res
===================================================================
--- branches/pingus_sdl/data/data/exits.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/exits.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -5,85 +5,85 @@
(name "desert_tut")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/desert_tut.png")))
+ (image-file "../images/exits/desert_tut.png"))
(sprite
(name "ice")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/ice.png")))
+ (image-file "../images/exits/ice.png"))
(sprite
(name "ice2")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/ice2.png")))
+ (image-file "../images/exits/ice2.png"))
(sprite
(name "stone")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/stone.png")))
+ (image-file "../images/exits/stone.png"))
(sprite
(name "desert")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/desertexit.png")))
+ (image-file "../images/exits/desertexit.png"))
(sprite
(name "space")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/space.png")
- (array 4 1)
- (size 154 118)
- (pos 0 0)))
+ (image-file "../images/exits/space.png")
+ (image-array 4 1)
+ (image-size 154 118)
+ (image-pos 0 0))
(sprite
(name "sweetexit")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/sweetexit.png")))
+ (image-file "../images/exits/sweetexit.png"))
(sprite
(name "sortie")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/sortie.png")))
+ (image-file "../images/exits/sortie.png"))
(sprite
(name "sortie_anim")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/sortie_anim.png")
- (array 11 1)
- (size 78 90)
- (pos 0 0)))
+ (image-file "../images/exits/sortie_anim.png")
+ (image-array 11 1)
+ (image-size 78 90)
+ (image-pos 0 0))
(sprite
(name "industrial")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/industrial.png")))
+ (image-file "../images/exits/industrial.png"))
(sprite
(name "crystal")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/crystal.png")))
+ (image-file "../images/exits/crystal.png"))
(sprite
(name "ordina")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/ordina.png")))
+ (image-file "../images/exits/ordina.png"))
(sprite
(name "mud")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/exits/mud.png")))
+ (image-file "../images/exits/mud.png"))
)
)
Modified: branches/pingus_sdl/data/data/game.res
===================================================================
--- branches/pingus_sdl/data/data/game.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/game.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -3,11 +3,11 @@
(section (name "game")
(sprite
(name "loading")
- (image (file "../images/core/misc/loading.png")))
+ (image-file "../images/core/misc/loading.png"))
(sprite
(name "pingubw")
- (image (file "../images/core/misc/pingubw.png")))
+ (image-file "../images/core/misc/pingubw.png"))
(sprite
(name "404")
@@ -15,82 +15,82 @@
(sprite
(name "dot_green")
- (image (file "../images/core/worldmap/dot_green.png")))
+ (image-file "../images/core/worldmap/dot_green.png"))
(sprite
(name "dot_red")
- (image (file "../images/core/worldmap/dot_red.png")))
+ (image-file "../images/core/worldmap/dot_red.png"))
(section (name "cursors")
(sprite
(name "editor")
- (image (file "../images/core/cursors/editor.png")))
+ (image-file "../images/core/cursors/editor.png"))
(sprite
(name "cursor")
- (image (file "../images/core/cursors/cursor.png")))
+ (image-file "../images/core/cursors/cursor.png"))
(sprite
(name "scroll_cur")
- (image (file "../images/core/cursors/scroll.png")))
+ (image-file "../images/core/cursors/scroll.png"))
(sprite
(name "capgood")
(origin "center")
(offset 0 0)
- (image (file "../images/core/cursors/cap.png")))
+ (image-file "../images/core/cursors/cap.png"))
(sprite
(name "capbad")
(origin "center")
(offset 0 0)
- (image (file "../images/core/cursors/capwrong.png")))
+ (image-file "../images/core/cursors/capwrong.png"))
(sprite
(name "cross")
(origin "center")
(offset 0 0)
- (image (file "../images/core/cursors/cross.png")))
+ (image-file "../images/core/cursors/cross.png"))
(sprite
(name "arrow_right")
(origin "center")
(offset 0 28)
- (image (file "../images/core/cursors/arrow_right.png")))
+ (image-file "../images/core/cursors/arrow_right.png"))
(sprite
(name "arrow_left")
(origin "center")
(offset 0 28)
- (image (file "../images/core/cursors/arrow_left.png")))
+ (image-file "../images/core/cursors/arrow_left.png"))
)
(section (name "smallmap")
(sprite
(name "entrance")
- (image (file "../images/core/misc/smallmap_entrance.png")))
+ (image-file "../images/core/misc/smallmap_entrance.png"))
(sprite
(name "exit")
- (image (file "../images/core/misc/smallmap_exit.png")))
+ (image-file "../images/core/misc/smallmap_exit.png"))
)
(section (name "stars")
(sprite
(name "large_star")
- (image (file "../images/backgrounds/large_star.png")))
+ (image-file "../images/backgrounds/large_star.png"))
(sprite
(name "middle_star")
- (image (file "../images/backgrounds/middle_star.png")))
+ (image-file "../images/backgrounds/middle_star.png"))
(sprite
(name "small_star")
- (image (file "../images/backgrounds/small_star.png")))
+ (image-file "../images/backgrounds/small_star.png"))
(sprite
(name "starfield_icon")
- (image (file "../images/backgrounds/starfield_icon.png")))
+ (image-file "../images/backgrounds/starfield_icon.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/groundpieces-bridge.res
===================================================================
--- branches/pingus_sdl/data/data/groundpieces-bridge.res 2007-01-14
20:34:25 UTC (rev 2651)
+++ branches/pingus_sdl/data/data/groundpieces-bridge.res 2007-01-14
23:59:43 UTC (rev 2652)
@@ -5,25 +5,25 @@
(section (name "misc")
(sprite
(name "bridge_left")
- (image (file "../images/groundpieces/bridge/misc/bridge_left.png")))
+ (image-file "../images/groundpieces/bridge/misc/bridge_left.png"))
(sprite
(name "bridge_right")
- (image (file "../images/groundpieces/bridge/misc/bridge_right.png")))
+ (image-file "../images/groundpieces/bridge/misc/bridge_right.png"))
)
(section (name "space")
(sprite
(name "grid1")
- (image (file "../images/groundpieces/bridge/space/grid1.png")))
+ (image-file "../images/groundpieces/bridge/space/grid1.png"))
(sprite
(name "grid2")
- (image (file "../images/groundpieces/bridge/space/grid2.png")))
+ (image-file "../images/groundpieces/bridge/space/grid2.png"))
(sprite
(name "grid3")
- (image (file "../images/groundpieces/bridge/space/grid3.png")))
+ (image-file "../images/groundpieces/bridge/space/grid3.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/groundpieces-ground.res
===================================================================
--- branches/pingus_sdl/data/data/groundpieces-ground.res 2007-01-14
20:34:25 UTC (rev 2651)
+++ branches/pingus_sdl/data/data/groundpieces-ground.res 2007-01-14
23:59:43 UTC (rev 2652)
@@ -5,1257 +5,1257 @@
(section (name "crystal")
(sprite
(name "block")
- (image (file "../images/groundpieces/ground/crystal/block.png")))
+ (image-file "../images/groundpieces/ground/crystal/block.png"))
(sprite
(name "column")
- (image (file "../images/groundpieces/ground/crystal/column.png")))
+ (image-file "../images/groundpieces/ground/crystal/column.png"))
(sprite
(name "diagcrystal")
- (image (file
"../images/groundpieces/ground/crystal/diagcrystal.png")))
+ (image-file "../images/groundpieces/ground/crystal/diagcrystal.png"))
(sprite
(name "hexcrystal")
- (image (file
"../images/groundpieces/ground/crystal/hexcrystal.png")))
+ (image-file "../images/groundpieces/ground/crystal/hexcrystal.png"))
(sprite
(name "horiz")
- (image (file "../images/groundpieces/ground/crystal/horiz.png")))
+ (image-file "../images/groundpieces/ground/crystal/horiz.png"))
(sprite
(name "horiz2")
- (image (file "../images/groundpieces/ground/crystal/horiz2.png")))
+ (image-file "../images/groundpieces/ground/crystal/horiz2.png"))
(sprite
(name "pipe")
- (image (file "../images/groundpieces/ground/crystal/pipe.png")))
+ (image-file "../images/groundpieces/ground/crystal/pipe.png"))
(sprite
(name "pipeend")
- (image (file "../images/groundpieces/ground/crystal/pipeend.png")))
+ (image-file "../images/groundpieces/ground/crystal/pipeend.png"))
(sprite
(name "platform")
- (image (file "../images/groundpieces/ground/crystal/platform.png")))
+ (image-file "../images/groundpieces/ground/crystal/platform.png"))
(sprite
(name "platform2")
- (image (file "../images/groundpieces/ground/crystal/platform2.png")))
+ (image-file "../images/groundpieces/ground/crystal/platform2.png"))
(sprite
(name "pointleft")
- (image (file "../images/groundpieces/ground/crystal/pointleft.png")))
+ (image-file "../images/groundpieces/ground/crystal/pointleft.png"))
(sprite
(name "pointright")
- (image (file
"../images/groundpieces/ground/crystal/pointright.png")))
+ (image-file "../images/groundpieces/ground/crystal/pointright.png"))
(sprite
(name "skinnycrystal")
- (image (file
"../images/groundpieces/ground/crystal/skinnycrystal.png")))
+ (image-file
"../images/groundpieces/ground/crystal/skinnycrystal.png"))
(sprite
(name "smcrystal")
- (image (file "../images/groundpieces/ground/crystal/smcrystal.png")))
+ (image-file "../images/groundpieces/ground/crystal/smcrystal.png"))
(sprite
(name "tesselate")
- (image (file "../images/groundpieces/ground/crystal/tesselate.png")))
+ (image-file "../images/groundpieces/ground/crystal/tesselate.png"))
)
(section (name "desert")
(sprite
(name "bigblock-broken1")
- (image (file
"../images/groundpieces/ground/desert/bigblock-broken1.png")))
+ (image-file
"../images/groundpieces/ground/desert/bigblock-broken1.png"))
(sprite
(name "bigblock-broken2")
- (image (file
"../images/groundpieces/ground/desert/bigblock-broken2.png")))
+ (image-file
"../images/groundpieces/ground/desert/bigblock-broken2.png"))
(sprite
(name "bigblock-broken3")
- (image (file
"../images/groundpieces/ground/desert/bigblock-broken3.png")))
+ (image-file
"../images/groundpieces/ground/desert/bigblock-broken3.png"))
(sprite
(name "bigdune1")
- (image (file "../images/groundpieces/ground/desert/bigdune1.png")))
+ (image-file "../images/groundpieces/ground/desert/bigdune1.png"))
(sprite
(name "bigprickpiece")
- (image (file
"../images/groundpieces/ground/desert/bigprickpiece.png")))
+ (image-file
"../images/groundpieces/ground/desert/bigprickpiece.png"))
(sprite
(name "bigsand")
- (image (file "../images/groundpieces/ground/desert/bigsand.png")))
+ (image-file "../images/groundpieces/ground/desert/bigsand.png"))
(sprite
(name "blobdune")
- (image (file "../images/groundpieces/ground/desert/blobdune.png")))
+ (image-file "../images/groundpieces/ground/desert/blobdune.png"))
(sprite
(name "column")
- (image (file "../images/groundpieces/ground/desert/column.png")))
+ (image-file "../images/groundpieces/ground/desert/column.png"))
(sprite
(name "column_piece1")
- (image (file
"../images/groundpieces/ground/desert/column_piece1.png")))
+ (image-file
"../images/groundpieces/ground/desert/column_piece1.png"))
(sprite
(name "column_piece2")
- (image (file
"../images/groundpieces/ground/desert/column_piece2.png")))
+ (image-file
"../images/groundpieces/ground/desert/column_piece2.png"))
(sprite
(name "column_piece3")
- (image (file
"../images/groundpieces/ground/desert/column_piece3.png")))
+ (image-file
"../images/groundpieces/ground/desert/column_piece3.png"))
(sprite
(name "domedune")
- (image (file "../images/groundpieces/ground/desert/domedune.png")))
+ (image-file "../images/groundpieces/ground/desert/domedune.png"))
(sprite
(name "flat")
- (image (file "../images/groundpieces/ground/desert/flat.png")))
+ (image-file "../images/groundpieces/ground/desert/flat.png"))
(sprite
(name "flatdune")
- (image (file "../images/groundpieces/ground/desert/flatdune.png")))
+ (image-file "../images/groundpieces/ground/desert/flatdune.png"))
(sprite
(name "leftsmallbrick")
- (image (file
"../images/groundpieces/ground/desert/leftsmallbrick.png")))
+ (image-file
"../images/groundpieces/ground/desert/leftsmallbrick.png"))
(sprite
(name "leftsmallsand")
- (image (file
"../images/groundpieces/ground/desert/leftsmallsand.png")))
+ (image-file
"../images/groundpieces/ground/desert/leftsmallsand.png"))
(sprite
(name "mediumsand")
- (image (file "../images/groundpieces/ground/desert/mediumsand.png")))
+ (image-file "../images/groundpieces/ground/desert/mediumsand.png"))
(sprite
(name "middleprickpiece")
- (image (file
"../images/groundpieces/ground/desert/middleprickpiece.png")))
+ (image-file
"../images/groundpieces/ground/desert/middleprickpiece.png"))
(sprite
(name "peakdune")
- (image (file "../images/groundpieces/ground/desert/peakdune.png")))
+ (image-file "../images/groundpieces/ground/desert/peakdune.png"))
(sprite
(name "pillar1")
- (image (file "../images/groundpieces/ground/desert/pillar1.png")))
+ (image-file "../images/groundpieces/ground/desert/pillar1.png"))
(sprite
(name "pillar2")
- (image (file "../images/groundpieces/ground/desert/pillar2.png")))
+ (image-file "../images/groundpieces/ground/desert/pillar2.png"))
(sprite
(name "pillar3")
- (image (file "../images/groundpieces/ground/desert/pillar3.png")))
+ (image-file "../images/groundpieces/ground/desert/pillar3.png"))
(sprite
(name "platform")
- (image (file "../images/groundpieces/ground/desert/platform.png")))
+ (image-file "../images/groundpieces/ground/desert/platform.png"))
(sprite
(name "platform_left")
- (image (file
"../images/groundpieces/ground/desert/platform_left.png")))
+ (image-file
"../images/groundpieces/ground/desert/platform_left.png"))
(sprite
(name "platform_right")
- (image (file
"../images/groundpieces/ground/desert/platform_right.png")))
+ (image-file
"../images/groundpieces/ground/desert/platform_right.png"))
(sprite
(name "rightsmallbrick")
- (image (file
"../images/groundpieces/ground/desert/rightsmallbrick.png")))
+ (image-file
"../images/groundpieces/ground/desert/rightsmallbrick.png"))
(sprite
(name "rightsmallsand")
- (image (file
"../images/groundpieces/ground/desert/rightsmallsand.png")))
+ (image-file
"../images/groundpieces/ground/desert/rightsmallsand.png"))
(sprite
(name "sluggydu")
- (image (file "../images/groundpieces/ground/desert/sluggydu.png")))
+ (image-file "../images/groundpieces/ground/desert/sluggydu.png"))
(sprite
(name "smallbrickpiece")
- (image (file
"../images/groundpieces/ground/desert/smallbrickpiece.png")))
+ (image-file
"../images/groundpieces/ground/desert/smallbrickpiece.png"))
(sprite
(name "smallsand")
- (image (file "../images/groundpieces/ground/desert/smallsand.png")))
+ (image-file "../images/groundpieces/ground/desert/smallsand.png"))
)
(section (name "foliage")
(sprite
(name "flax1")
- (image (file "../images/groundpieces/ground/foliage/flax1.png")))
+ (image-file "../images/groundpieces/ground/foliage/flax1.png"))
(sprite
(name "flax2")
- (image (file "../images/groundpieces/ground/foliage/flax2.png")))
+ (image-file "../images/groundpieces/ground/foliage/flax2.png"))
(sprite
(name "midtree1")
- (image (file "../images/groundpieces/ground/foliage/midtree1.png")))
+ (image-file "../images/groundpieces/ground/foliage/midtree1.png"))
(sprite
(name "midtree2")
- (image (file "../images/groundpieces/ground/foliage/midtree2.png")))
+ (image-file "../images/groundpieces/ground/foliage/midtree2.png"))
(sprite
(name "oak1")
- (image (file "../images/groundpieces/ground/foliage/oak1.png")))
+ (image-file "../images/groundpieces/ground/foliage/oak1.png"))
(sprite
(name "rock1")
- (image (file "../images/groundpieces/ground/foliage/rock1.png")))
+ (image-file "../images/groundpieces/ground/foliage/rock1.png"))
(sprite
(name "rock2")
- (image (file "../images/groundpieces/ground/foliage/rock2.png")))
+ (image-file "../images/groundpieces/ground/foliage/rock2.png"))
(sprite
(name "rock3")
- (image (file "../images/groundpieces/ground/foliage/rock3.png")))
+ (image-file "../images/groundpieces/ground/foliage/rock3.png"))
(sprite
(name "rock4")
- (image (file "../images/groundpieces/ground/foliage/rock4.png")))
+ (image-file "../images/groundpieces/ground/foliage/rock4.png"))
(sprite
(name "rock5")
- (image (file "../images/groundpieces/ground/foliage/rock5.png")))
+ (image-file "../images/groundpieces/ground/foliage/rock5.png"))
(sprite
(name "rock6")
- (image (file "../images/groundpieces/ground/foliage/rock6.png")))
+ (image-file "../images/groundpieces/ground/foliage/rock6.png"))
(sprite
(name "smallbush")
- (image (file "../images/groundpieces/ground/foliage/smallbush.png")))
+ (image-file "../images/groundpieces/ground/foliage/smallbush.png"))
(sprite
(name "smallbush2")
- (image (file
"../images/groundpieces/ground/foliage/smallbush2.png")))
+ (image-file "../images/groundpieces/ground/foliage/smallbush2.png"))
(sprite
(name "smallbush3")
- (image (file
"../images/groundpieces/ground/foliage/smallbush3.png")))
+ (image-file "../images/groundpieces/ground/foliage/smallbush3.png"))
(sprite
(name "talltree")
- (image (file "../images/groundpieces/ground/foliage/talltree.png")))
+ (image-file "../images/groundpieces/ground/foliage/talltree.png"))
)
(section (name "green")
(sprite
(name "piece1")
- (image (file "../images/groundpieces/ground/green/piece1.png")))
+ (image-file "../images/groundpieces/ground/green/piece1.png"))
(sprite
(name "piece2")
- (image (file "../images/groundpieces/ground/green/piece2.png")))
+ (image-file "../images/groundpieces/ground/green/piece2.png"))
(sprite
(name "piece3")
- (image (file "../images/groundpieces/ground/green/piece3.png")))
+ (image-file "../images/groundpieces/ground/green/piece3.png"))
)
(section (name "industrial")
(sprite
(name "pipe1")
- (image (file "../images/groundpieces/ground/industrial/pipe1.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe1.png"))
(sprite
(name "pipe2")
- (image (file "../images/groundpieces/ground/industrial/pipe2.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe2.png"))
(sprite
(name "pipe3")
- (image (file "../images/groundpieces/ground/industrial/pipe3.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe3.png"))
(sprite
(name "pipe4")
- (image (file "../images/groundpieces/ground/industrial/pipe4.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe4.png"))
(sprite
(name "pipe5")
- (image (file "../images/groundpieces/ground/industrial/pipe5.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe5.png"))
(sprite
(name "pipe6")
- (image (file "../images/groundpieces/ground/industrial/pipe6.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe6.png"))
(sprite
(name "pipe7")
- (image (file "../images/groundpieces/ground/industrial/pipe7.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe7.png"))
(sprite
(name "pipe8")
- (image (file "../images/groundpieces/ground/industrial/pipe8.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe8.png"))
(sprite
(name "pipe_bl")
- (image (file
"../images/groundpieces/ground/industrial/pipe_bl.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe_bl.png"))
(sprite
(name "pipe_br")
- (image (file
"../images/groundpieces/ground/industrial/pipe_br.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe_br.png"))
(sprite
(name "pipe_ul")
- (image (file
"../images/groundpieces/ground/industrial/pipe_ul.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe_ul.png"))
(sprite
(name "pipe_ur")
- (image (file
"../images/groundpieces/ground/industrial/pipe_ur.png")))
+ (image-file "../images/groundpieces/ground/industrial/pipe_ur.png"))
)
(section (name "jungle")
(sprite
(name "branch1")
- (image (file "../images/groundpieces/ground/jungle/branch1.png")))
+ (image-file "../images/groundpieces/ground/jungle/branch1.png"))
(sprite
(name "branch2")
- (image (file "../images/groundpieces/ground/jungle/branch2.png")))
+ (image-file "../images/groundpieces/ground/jungle/branch2.png"))
(sprite
(name "branch3")
- (image (file "../images/groundpieces/ground/jungle/branch3.png")))
+ (image-file "../images/groundpieces/ground/jungle/branch3.png"))
(sprite
(name "branch4")
- (image (file "../images/groundpieces/ground/jungle/branch4.png")))
+ (image-file "../images/groundpieces/ground/jungle/branch4.png"))
(sprite
(name "branch5")
- (image (file "../images/groundpieces/ground/jungle/branch5.png")))
+ (image-file "../images/groundpieces/ground/jungle/branch5.png"))
(sprite
(name "branch6")
- (image (file "../images/groundpieces/ground/jungle/branch6.png")))
+ (image-file "../images/groundpieces/ground/jungle/branch6.png"))
(sprite
(name "carabatree")
- (image (file "../images/groundpieces/ground/jungle/carabatree.png")))
+ (image-file "../images/groundpieces/ground/jungle/carabatree.png"))
(sprite
(name "carabatreemedium")
- (image (file
"../images/groundpieces/ground/jungle/carabatreemedium.png")))
+ (image-file
"../images/groundpieces/ground/jungle/carabatreemedium.png"))
(sprite
(name "carabatreesmall")
- (image (file
"../images/groundpieces/ground/jungle/carabatreesmall.png")))
+ (image-file
"../images/groundpieces/ground/jungle/carabatreesmall.png"))
(sprite
(name "stick1")
- (image (file "../images/groundpieces/ground/jungle/stick1.png")))
+ (image-file "../images/groundpieces/ground/jungle/stick1.png"))
(sprite
(name "stick2")
- (image (file "../images/groundpieces/ground/jungle/stick2.png")))
+ (image-file "../images/groundpieces/ground/jungle/stick2.png"))
(sprite
(name "stick3")
- (image (file "../images/groundpieces/ground/jungle/stick3.png")))
+ (image-file "../images/groundpieces/ground/jungle/stick3.png"))
(sprite
(name "stick4")
- (image (file "../images/groundpieces/ground/jungle/stick4.png")))
+ (image-file "../images/groundpieces/ground/jungle/stick4.png"))
(sprite
(name "stick5")
- (image (file "../images/groundpieces/ground/jungle/stick5.png")))
+ (image-file "../images/groundpieces/ground/jungle/stick5.png"))
(sprite
(name "stone1")
- (image (file "../images/groundpieces/ground/jungle/stone1.png")))
+ (image-file "../images/groundpieces/ground/jungle/stone1.png"))
(sprite
(name "stone2")
- (image (file "../images/groundpieces/ground/jungle/stone2.png")))
+ (image-file "../images/groundpieces/ground/jungle/stone2.png"))
(sprite
(name "stone3")
- (image (file "../images/groundpieces/ground/jungle/stone3.png")))
+ (image-file "../images/groundpieces/ground/jungle/stone3.png"))
(sprite
(name "stone4")
- (image (file "../images/groundpieces/ground/jungle/stone4.png")))
+ (image-file "../images/groundpieces/ground/jungle/stone4.png"))
(sprite
(name "stone5")
- (image (file "../images/groundpieces/ground/jungle/stone5.png")))
+ (image-file "../images/groundpieces/ground/jungle/stone5.png"))
(sprite
(name "twist")
- (image (file "../images/groundpieces/ground/jungle/twist.png")))
+ (image-file "../images/groundpieces/ground/jungle/twist.png"))
(sprite
(name "twistsmooth")
- (image (file
"../images/groundpieces/ground/jungle/twistsmooth.png")))
+ (image-file "../images/groundpieces/ground/jungle/twistsmooth.png"))
)
(section (name "misc")
(sprite
(name "bpiece1")
- (image (file "../images/groundpieces/ground/misc/bpiece1.png")))
+ (image-file "../images/groundpieces/ground/misc/bpiece1.png"))
(sprite
(name "bpiece2")
- (image (file "../images/groundpieces/ground/misc/bpiece2.png")))
+ (image-file "../images/groundpieces/ground/misc/bpiece2.png"))
(sprite
(name "bpiece3")
- (image (file "../images/groundpieces/ground/misc/bpiece3.png")))
+ (image-file "../images/groundpieces/ground/misc/bpiece3.png"))
(sprite
(name "bpiece4")
- (image (file "../images/groundpieces/ground/misc/bpiece4.png")))
+ (image-file "../images/groundpieces/ground/misc/bpiece4.png"))
(sprite
(name "bpiece5")
- (image (file "../images/groundpieces/ground/misc/bpiece5.png")))
+ (image-file "../images/groundpieces/ground/misc/bpiece5.png"))
(sprite
(name "bpiece6")
- (image (file "../images/groundpieces/ground/misc/bpiece6.png")))
+ (image-file "../images/groundpieces/ground/misc/bpiece6.png"))
(sprite
(name "bpiece7")
- (image (file "../images/groundpieces/ground/misc/bpiece7.png")))
+ (image-file "../images/groundpieces/ground/misc/bpiece7.png"))
(sprite
(name "bpiece8")
- (image (file "../images/groundpieces/ground/misc/bpiece8.png")))
+ (image-file "../images/groundpieces/ground/misc/bpiece8.png"))
(sprite
(name "bpiece9")
- (image (file "../images/groundpieces/ground/misc/bpiece9.png")))
+ (image-file "../images/groundpieces/ground/misc/bpiece9.png"))
(sprite
(name "brick1")
- (image (file "../images/groundpieces/ground/misc/brick1.png")))
+ (image-file "../images/groundpieces/ground/misc/brick1.png"))
(sprite
(name "brick2")
- (image (file "../images/groundpieces/ground/misc/brick2.png")))
+ (image-file "../images/groundpieces/ground/misc/brick2.png"))
(sprite
(name "brick3")
- (image (file "../images/groundpieces/ground/misc/brick3.png")))
+ (image-file "../images/groundpieces/ground/misc/brick3.png"))
(sprite
(name "brick4")
- (image (file "../images/groundpieces/ground/misc/brick4.png")))
+ (image-file "../images/groundpieces/ground/misc/brick4.png"))
(sprite
(name "brick5")
- (image (file "../images/groundpieces/ground/misc/brick5.png")))
+ (image-file "../images/groundpieces/ground/misc/brick5.png"))
(sprite
(name "bridge1")
- (image (file "../images/groundpieces/ground/misc/bridge1.png")))
+ (image-file "../images/groundpieces/ground/misc/bridge1.png"))
(sprite
(name "bridge2")
- (image (file "../images/groundpieces/ground/misc/bridge2.png")))
+ (image-file "../images/groundpieces/ground/misc/bridge2.png"))
(sprite
(name "column")
- (image (file "../images/groundpieces/ground/misc/column.png")))
+ (image-file "../images/groundpieces/ground/misc/column.png"))
(sprite
(name "column_down")
- (image (file "../images/groundpieces/ground/misc/column_down.png")))
+ (image-file "../images/groundpieces/ground/misc/column_down.png"))
(sprite
(name "column_flat")
- (image (file "../images/groundpieces/ground/misc/column_flat.png")))
+ (image-file "../images/groundpieces/ground/misc/column_flat.png"))
(sprite
(name "column_flat_left")
- (image (file
"../images/groundpieces/ground/misc/column_flat_left.png")))
+ (image-file
"../images/groundpieces/ground/misc/column_flat_left.png"))
(sprite
(name "column_flat_right")
- (image (file
"../images/groundpieces/ground/misc/column_flat_right.png")))
+ (image-file
"../images/groundpieces/ground/misc/column_flat_right.png"))
(sprite
(name "column_horz")
- (image (file "../images/groundpieces/ground/misc/column_horz.png")))
+ (image-file "../images/groundpieces/ground/misc/column_horz.png"))
(sprite
(name "column_up")
- (image (file "../images/groundpieces/ground/misc/column_up.png")))
+ (image-file "../images/groundpieces/ground/misc/column_up.png"))
(sprite
(name "column_vert")
- (image (file "../images/groundpieces/ground/misc/column_vert.png")))
+ (image-file "../images/groundpieces/ground/misc/column_vert.png"))
(sprite
(name "dragon")
- (image (file "../images/groundpieces/ground/misc/dragon.png")))
+ (image-file "../images/groundpieces/ground/misc/dragon.png"))
(sprite
(name "green1")
- (image (file "../images/groundpieces/ground/misc/green1.png")))
+ (image-file "../images/groundpieces/ground/misc/green1.png"))
(sprite
(name "green2")
- (image (file "../images/groundpieces/ground/misc/green2.png")))
+ (image-file "../images/groundpieces/ground/misc/green2.png"))
(sprite
(name "grey_stone1")
- (image (file "../images/groundpieces/ground/misc/grey_stone1.png")))
+ (image-file "../images/groundpieces/ground/misc/grey_stone1.png"))
(sprite
(name "grey_stone2")
- (image (file "../images/groundpieces/ground/misc/grey_stone2.png")))
+ (image-file "../images/groundpieces/ground/misc/grey_stone2.png"))
(sprite
(name "grey_stone3")
- (image (file "../images/groundpieces/ground/misc/grey_stone3.png")))
+ (image-file "../images/groundpieces/ground/misc/grey_stone3.png"))
(sprite
(name "grey_stone4")
- (image (file "../images/groundpieces/ground/misc/grey_stone4.png")))
+ (image-file "../images/groundpieces/ground/misc/grey_stone4.png"))
(sprite
(name "grey_stone5")
- (image (file "../images/groundpieces/ground/misc/grey_stone5.png")))
+ (image-file "../images/groundpieces/ground/misc/grey_stone5.png"))
(sprite
(name "grey_stone6")
- (image (file "../images/groundpieces/ground/misc/grey_stone6.png")))
+ (image-file "../images/groundpieces/ground/misc/grey_stone6.png"))
(sprite
(name "pfosten")
- (image (file "../images/groundpieces/ground/misc/pfosten.png")))
+ (image-file "../images/groundpieces/ground/misc/pfosten.png"))
(sprite
(name "piece1")
- (image (file "../images/groundpieces/ground/misc/piece1.png")))
+ (image-file "../images/groundpieces/ground/misc/piece1.png"))
(sprite
(name "piece2")
- (image (file "../images/groundpieces/ground/misc/piece2.png")))
+ (image-file "../images/groundpieces/ground/misc/piece2.png"))
(sprite
(name "spike")
- (image (file "../images/groundpieces/ground/misc/spike.png")))
+ (image-file "../images/groundpieces/ground/misc/spike.png"))
(sprite
(name "stone0")
- (image (file "../images/groundpieces/ground/misc/stone0.png")))
+ (image-file "../images/groundpieces/ground/misc/stone0.png"))
(sprite
(name "stone1")
- (image (file "../images/groundpieces/ground/misc/stone1.png")))
+ (image-file "../images/groundpieces/ground/misc/stone1.png"))
(sprite
(name "stone2")
- (image (file "../images/groundpieces/ground/misc/stone2.png")))
+ (image-file "../images/groundpieces/ground/misc/stone2.png"))
(sprite
(name "stone3")
- (image (file "../images/groundpieces/ground/misc/stone3.png")))
+ (image-file "../images/groundpieces/ground/misc/stone3.png"))
(sprite
(name "stone4")
- (image (file "../images/groundpieces/ground/misc/stone4.png")))
+ (image-file "../images/groundpieces/ground/misc/stone4.png"))
(sprite
(name "stone5")
- (image (file "../images/groundpieces/ground/misc/stone5.png")))
+ (image-file "../images/groundpieces/ground/misc/stone5.png"))
(sprite
(name "stone6")
- (image (file "../images/groundpieces/ground/misc/stone6.png")))
+ (image-file "../images/groundpieces/ground/misc/stone6.png"))
(sprite
(name "stone7")
- (image (file "../images/groundpieces/ground/misc/stone7.png")))
+ (image-file "../images/groundpieces/ground/misc/stone7.png"))
(sprite
(name "stoneblock1")
- (image (file "../images/groundpieces/ground/misc/stoneblock1.png")))
+ (image-file "../images/groundpieces/ground/misc/stoneblock1.png"))
(sprite
(name "stoneblock2")
- (image (file "../images/groundpieces/ground/misc/stoneblock2.png")))
+ (image-file "../images/groundpieces/ground/misc/stoneblock2.png"))
(sprite
(name "stoneblock3")
- (image (file "../images/groundpieces/ground/misc/stoneblock3.png")))
+ (image-file "../images/groundpieces/ground/misc/stoneblock3.png"))
(sprite
(name "stoneblock5")
- (image (file "../images/groundpieces/ground/misc/stoneblock5.png")))
+ (image-file "../images/groundpieces/ground/misc/stoneblock5.png"))
(sprite
(name "stoneblock6")
- (image (file "../images/groundpieces/ground/misc/stoneblock6.png")))
+ (image-file "../images/groundpieces/ground/misc/stoneblock6.png"))
(sprite
(name "tree")
- (image (file "../images/groundpieces/ground/misc/tree.png")))
+ (image-file "../images/groundpieces/ground/misc/tree.png"))
(sprite
(name "well")
- (image (file "../images/groundpieces/ground/misc/well.png")))
+ (image-file "../images/groundpieces/ground/misc/well.png"))
(sprite
(name "wood1")
- (image (file "../images/groundpieces/ground/misc/wood1.png")))
+ (image-file "../images/groundpieces/ground/misc/wood1.png"))
(sprite
(name "wood2")
- (image (file "../images/groundpieces/ground/misc/wood2.png")))
+ (image-file "../images/groundpieces/ground/misc/wood2.png"))
)
(section (name "mud")
(sprite
(name "mudpiece1")
- (image (file "../images/groundpieces/ground/mud/mudpiece1.png")))
+ (image-file "../images/groundpieces/ground/mud/mudpiece1.png"))
(sprite
(name "mudpiece2")
- (image (file "../images/groundpieces/ground/mud/mudpiece2.png")))
+ (image-file "../images/groundpieces/ground/mud/mudpiece2.png"))
(sprite
(name "mudpiece3")
- (image (file "../images/groundpieces/ground/mud/mudpiece3.png")))
+ (image-file "../images/groundpieces/ground/mud/mudpiece3.png"))
)
(section (name "mushroom")
(sprite
(name "toadstool1")
- (image (file
"../images/groundpieces/ground/mushroom/toadstool1.png")))
+ (image-file "../images/groundpieces/ground/mushroom/toadstool1.png"))
(sprite
(name "toadstool2")
- (image (file
"../images/groundpieces/ground/mushroom/toadstool2.png")))
+ (image-file "../images/groundpieces/ground/mushroom/toadstool2.png"))
(sprite
(name "toadstool3")
- (image (file
"../images/groundpieces/ground/mushroom/toadstool3.png")))
+ (image-file "../images/groundpieces/ground/mushroom/toadstool3.png"))
(sprite
(name "toadstool4")
- (image (file
"../images/groundpieces/ground/mushroom/toadstool4.png")))
+ (image-file "../images/groundpieces/ground/mushroom/toadstool4.png"))
)
(section (name "ordina")
(sprite
(name "cable1")
- (image (file "../images/groundpieces/ground/ordina/cable1.png")))
+ (image-file "../images/groundpieces/ground/ordina/cable1.png"))
(sprite
(name "cable2")
- (image (file "../images/groundpieces/ground/ordina/cable2.png")))
+ (image-file "../images/groundpieces/ground/ordina/cable2.png"))
(sprite
(name "cdrom1")
- (image (file "../images/groundpieces/ground/ordina/cdrom1.png")))
+ (image-file "../images/groundpieces/ground/ordina/cdrom1.png"))
(sprite
(name "clavier1")
- (image (file "../images/groundpieces/ground/ordina/clavier1.png")))
+ (image-file "../images/groundpieces/ground/ordina/clavier1.png"))
(sprite
(name "cpu1")
- (image (file "../images/groundpieces/ground/ordina/cpu1.png")))
+ (image-file "../images/groundpieces/ground/ordina/cpu1.png"))
(sprite
(name "ecran")
- (image (file "../images/groundpieces/ground/ordina/ecran.png")))
+ (image-file "../images/groundpieces/ground/ordina/ecran.png"))
(sprite
(name "sol2")
- (image (file "../images/groundpieces/ground/ordina/sol2.png")))
+ (image-file "../images/groundpieces/ground/ordina/sol2.png"))
(sprite
(name "sol3")
- (image (file "../images/groundpieces/ground/ordina/sol3.png")))
+ (image-file "../images/groundpieces/ground/ordina/sol3.png"))
(sprite
(name "sol4")
- (image (file "../images/groundpieces/ground/ordina/sol4.png")))
+ (image-file "../images/groundpieces/ground/ordina/sol4.png"))
)
(section (name "real")
(sprite
(name "fish")
- (image (file "../images/groundpieces/ground/real/fish.png")))
+ (image-file "../images/groundpieces/ground/real/fish.png"))
(sprite
(name "green1")
- (image (file "../images/groundpieces/ground/real/green1.png")))
+ (image-file "../images/groundpieces/ground/real/green1.png"))
(sprite
(name "green2")
- (image (file "../images/groundpieces/ground/real/green2.png")))
+ (image-file "../images/groundpieces/ground/real/green2.png"))
(sprite
(name "real1")
- (image (file "../images/groundpieces/ground/real/real1.png")))
+ (image-file "../images/groundpieces/ground/real/real1.png"))
(sprite
(name "real10")
- (image (file "../images/groundpieces/ground/real/real10.png")))
+ (image-file "../images/groundpieces/ground/real/real10.png"))
(sprite
(name "real11")
- (image (file "../images/groundpieces/ground/real/real11.png")))
+ (image-file "../images/groundpieces/ground/real/real11.png"))
(sprite
(name "real12")
- (image (file "../images/groundpieces/ground/real/real12.png")))
+ (image-file "../images/groundpieces/ground/real/real12.png"))
(sprite
(name "real13")
- (image (file "../images/groundpieces/ground/real/real13.png")))
+ (image-file "../images/groundpieces/ground/real/real13.png"))
(sprite
(name "real14")
- (image (file "../images/groundpieces/ground/real/real14.png")))
+ (image-file "../images/groundpieces/ground/real/real14.png"))
(sprite
(name "real15")
- (image (file "../images/groundpieces/ground/real/real15.png")))
+ (image-file "../images/groundpieces/ground/real/real15.png"))
(sprite
(name "real16")
- (image (file "../images/groundpieces/ground/real/real16.png")))
+ (image-file "../images/groundpieces/ground/real/real16.png"))
(sprite
(name "real17")
- (image (file "../images/groundpieces/ground/real/real17.png")))
+ (image-file "../images/groundpieces/ground/real/real17.png"))
(sprite
(name "real18")
- (image (file "../images/groundpieces/ground/real/real18.png")))
+ (image-file "../images/groundpieces/ground/real/real18.png"))
(sprite
(name "real19")
- (image (file "../images/groundpieces/ground/real/real19.png")))
+ (image-file "../images/groundpieces/ground/real/real19.png"))
(sprite
(name "real2")
- (image (file "../images/groundpieces/ground/real/real2.png")))
+ (image-file "../images/groundpieces/ground/real/real2.png"))
(sprite
(name "real20")
- (image (file "../images/groundpieces/ground/real/real20.png")))
+ (image-file "../images/groundpieces/ground/real/real20.png"))
(sprite
(name "real21")
- (image (file "../images/groundpieces/ground/real/real21.png")))
+ (image-file "../images/groundpieces/ground/real/real21.png"))
(sprite
(name "real22")
- (image (file "../images/groundpieces/ground/real/real22.png")))
+ (image-file "../images/groundpieces/ground/real/real22.png"))
(sprite
(name "real23")
- (image (file "../images/groundpieces/ground/real/real23.png")))
+ (image-file "../images/groundpieces/ground/real/real23.png"))
(sprite
(name "real24")
- (image (file "../images/groundpieces/ground/real/real24.png")))
+ (image-file "../images/groundpieces/ground/real/real24.png"))
(sprite
(name "real25")
- (image (file "../images/groundpieces/ground/real/real25.png")))
+ (image-file "../images/groundpieces/ground/real/real25.png"))
(sprite
(name "real26")
- (image (file "../images/groundpieces/ground/real/real26.png")))
+ (image-file "../images/groundpieces/ground/real/real26.png"))
(sprite
(name "real27")
- (image (file "../images/groundpieces/ground/real/real27.png")))
+ (image-file "../images/groundpieces/ground/real/real27.png"))
(sprite
(name "real28")
- (image (file "../images/groundpieces/ground/real/real28.png")))
+ (image-file "../images/groundpieces/ground/real/real28.png"))
(sprite
(name "real29")
- (image (file "../images/groundpieces/ground/real/real29.png")))
+ (image-file "../images/groundpieces/ground/real/real29.png"))
(sprite
(name "real3")
- (image (file "../images/groundpieces/ground/real/real3.png")))
+ (image-file "../images/groundpieces/ground/real/real3.png"))
(sprite
(name "real30")
- (image (file "../images/groundpieces/ground/real/real30.png")))
+ (image-file "../images/groundpieces/ground/real/real30.png"))
(sprite
(name "real34")
- (image (file "../images/groundpieces/ground/real/real34.png")))
+ (image-file "../images/groundpieces/ground/real/real34.png"))
(sprite
(name "real35")
- (image (file "../images/groundpieces/ground/real/real35.png")))
+ (image-file "../images/groundpieces/ground/real/real35.png"))
(sprite
(name "real36")
- (image (file "../images/groundpieces/ground/real/real36.png")))
+ (image-file "../images/groundpieces/ground/real/real36.png"))
(sprite
(name "real37")
- (image (file "../images/groundpieces/ground/real/real37.png")))
+ (image-file "../images/groundpieces/ground/real/real37.png"))
(sprite
(name "real4")
- (image (file "../images/groundpieces/ground/real/real4.png")))
+ (image-file "../images/groundpieces/ground/real/real4.png"))
(sprite
(name "real5")
- (image (file "../images/groundpieces/ground/real/real5.png")))
+ (image-file "../images/groundpieces/ground/real/real5.png"))
(sprite
(name "real6")
- (image (file "../images/groundpieces/ground/real/real6.png")))
+ (image-file "../images/groundpieces/ground/real/real6.png"))
(sprite
(name "real7")
- (image (file "../images/groundpieces/ground/real/real7.png")))
+ (image-file "../images/groundpieces/ground/real/real7.png"))
(sprite
(name "real8")
- (image (file "../images/groundpieces/ground/real/real8.png")))
+ (image-file "../images/groundpieces/ground/real/real8.png"))
(sprite
(name "real9")
- (image (file "../images/groundpieces/ground/real/real9.png")))
+ (image-file "../images/groundpieces/ground/real/real9.png"))
)
(section (name "rock")
(sprite
(name "blackrock1")
- (image (file "../images/groundpieces/ground/rock/blackrock1.png")))
+ (image-file "../images/groundpieces/ground/rock/blackrock1.png"))
(sprite
(name "blackrock2")
- (image (file "../images/groundpieces/ground/rock/blackrock2.png")))
+ (image-file "../images/groundpieces/ground/rock/blackrock2.png"))
(sprite
(name "blackrock3")
- (image (file "../images/groundpieces/ground/rock/blackrock3.png")))
+ (image-file "../images/groundpieces/ground/rock/blackrock3.png"))
(sprite
(name "blackrock4")
- (image (file "../images/groundpieces/ground/rock/blackrock4.png")))
+ (image-file "../images/groundpieces/ground/rock/blackrock4.png"))
(sprite
(name "stone1")
- (image (file "../images/groundpieces/ground/rock/stone1.png")))
+ (image-file "../images/groundpieces/ground/rock/stone1.png"))
)
(section (name "signposts")
(sprite
(name "arrow_down")
- (image (file
"../images/groundpieces/ground/signposts/arrow_down.png")))
+ (image-file
"../images/groundpieces/ground/signposts/arrow_down.png"))
(sprite
(name "arrow_left")
- (image (file
"../images/groundpieces/ground/signposts/arrow_left.png")))
+ (image-file
"../images/groundpieces/ground/signposts/arrow_left.png"))
(sprite
(name "arrow_right")
- (image (file
"../images/groundpieces/ground/signposts/arrow_right.png")))
+ (image-file
"../images/groundpieces/ground/signposts/arrow_right.png"))
(sprite
(name "arrow_up")
- (image (file
"../images/groundpieces/ground/signposts/arrow_up.png")))
+ (image-file "../images/groundpieces/ground/signposts/arrow_up.png"))
(sprite
(name "danger")
- (image (file "../images/groundpieces/ground/signposts/danger.png")))
+ (image-file "../images/groundpieces/ground/signposts/danger.png"))
)
(section (name "snow")
(sprite
(name "block1")
- (image (file "../images/groundpieces/ground/snow/block1.png")))
+ (image-file "../images/groundpieces/ground/snow/block1.png"))
(sprite
(name "block2")
- (image (file "../images/groundpieces/ground/snow/block2.png")))
+ (image-file "../images/groundpieces/ground/snow/block2.png"))
(sprite
(name "block3")
- (image (file "../images/groundpieces/ground/snow/block3.png")))
+ (image-file "../images/groundpieces/ground/snow/block3.png"))
(sprite
(name "block4")
- (image (file "../images/groundpieces/ground/snow/block4.png")))
+ (image-file "../images/groundpieces/ground/snow/block4.png"))
(sprite
(name "cabin")
- (image (file "../images/groundpieces/ground/snow/cabin.png")))
+ (image-file "../images/groundpieces/ground/snow/cabin.png"))
(sprite
(name "cabin_winter")
- (image (file "../images/groundpieces/ground/snow/cabin_winter.png")))
+ (image-file "../images/groundpieces/ground/snow/cabin_winter.png"))
(sprite
(name "diablock1")
- (image (file "../images/groundpieces/ground/snow/diablock1.png")))
+ (image-file "../images/groundpieces/ground/snow/diablock1.png"))
(sprite
(name "diablock2")
- (image (file "../images/groundpieces/ground/snow/diablock2.png")))
+ (image-file "../images/groundpieces/ground/snow/diablock2.png"))
(sprite
(name "diablock3")
- (image (file "../images/groundpieces/ground/snow/diablock3.png")))
+ (image-file "../images/groundpieces/ground/snow/diablock3.png"))
(sprite
(name "gpiece1")
- (image (file "../images/groundpieces/ground/snow/gpiece1.png")))
+ (image-file "../images/groundpieces/ground/snow/gpiece1.png"))
(sprite
(name "groundice")
- (image (file "../images/groundpieces/ground/snow/groundice.png")))
+ (image-file "../images/groundpieces/ground/snow/groundice.png"))
(sprite
(name "ice1")
- (image (file "../images/groundpieces/ground/snow/ice1.png")))
+ (image-file "../images/groundpieces/ground/snow/ice1.png"))
(sprite
(name "ice2")
- (image (file "../images/groundpieces/ground/snow/ice2.png")))
+ (image-file "../images/groundpieces/ground/snow/ice2.png"))
(sprite
(name "ice3")
- (image (file "../images/groundpieces/ground/snow/ice3.png")))
+ (image-file "../images/groundpieces/ground/snow/ice3.png"))
(sprite
(name "iceblock1")
- (image (file "../images/groundpieces/ground/snow/iceblock1.png")))
+ (image-file "../images/groundpieces/ground/snow/iceblock1.png"))
(sprite
(name "icepiece1")
- (image (file "../images/groundpieces/ground/snow/icepiece1.png")))
+ (image-file "../images/groundpieces/ground/snow/icepiece1.png"))
(sprite
(name "igloo")
- (image (file "../images/groundpieces/ground/snow/igloo.png")))
+ (image-file "../images/groundpieces/ground/snow/igloo.png"))
(sprite
(name "piece1")
- (image (file "../images/groundpieces/ground/snow/piece1.png")))
+ (image-file "../images/groundpieces/ground/snow/piece1.png"))
(sprite
(name "piece10")
- (image (file "../images/groundpieces/ground/snow/piece10.png")))
+ (image-file "../images/groundpieces/ground/snow/piece10.png"))
(sprite
(name "piece2")
- (image (file "../images/groundpieces/ground/snow/piece2.png")))
+ (image-file "../images/groundpieces/ground/snow/piece2.png"))
(sprite
(name "piece3")
- (image (file "../images/groundpieces/ground/snow/piece3.png")))
+ (image-file "../images/groundpieces/ground/snow/piece3.png"))
(sprite
(name "piece7")
- (image (file "../images/groundpieces/ground/snow/piece7.png")))
+ (image-file "../images/groundpieces/ground/snow/piece7.png"))
(sprite
(name "piece8")
- (image (file "../images/groundpieces/ground/snow/piece8.png")))
+ (image-file "../images/groundpieces/ground/snow/piece8.png"))
(sprite
(name "piece9")
- (image (file "../images/groundpieces/ground/snow/piece9.png")))
+ (image-file "../images/groundpieces/ground/snow/piece9.png"))
(sprite
(name "pillar1")
- (image (file "../images/groundpieces/ground/snow/pillar1.png")))
+ (image-file "../images/groundpieces/ground/snow/pillar1.png"))
(sprite
(name "pillar2")
- (image (file "../images/groundpieces/ground/snow/pillar2.png")))
+ (image-file "../images/groundpieces/ground/snow/pillar2.png"))
(sprite
(name "slopedr")
- (image (file "../images/groundpieces/ground/snow/slopedr.png")))
+ (image-file "../images/groundpieces/ground/snow/slopedr.png"))
(sprite
(name "snowball1")
- (image (file "../images/groundpieces/ground/snow/snowball1.png")))
+ (image-file "../images/groundpieces/ground/snow/snowball1.png"))
(sprite
(name "snowman")
- (image (file "../images/groundpieces/ground/snow/snowman.png")))
+ (image-file "../images/groundpieces/ground/snow/snowman.png"))
(sprite
(name "way")
- (image (file "../images/groundpieces/ground/snow/way.png")))
+ (image-file "../images/groundpieces/ground/snow/way.png"))
(sprite
(name "xmas-tree")
- (image (file "../images/groundpieces/ground/snow/xmas-tree.png")))
+ (image-file "../images/groundpieces/ground/snow/xmas-tree.png"))
)
(section (name "sortie")
(sprite
(name "ball1")
- (image (file "../images/groundpieces/ground/sortie/ball1.png")))
+ (image-file "../images/groundpieces/ground/sortie/ball1.png"))
(sprite
(name "ball2")
- (image (file "../images/groundpieces/ground/sortie/ball2.png")))
+ (image-file "../images/groundpieces/ground/sortie/ball2.png"))
(sprite
(name "ball3")
- (image (file "../images/groundpieces/ground/sortie/ball3.png")))
+ (image-file "../images/groundpieces/ground/sortie/ball3.png"))
(sprite
(name "ball4")
- (image (file "../images/groundpieces/ground/sortie/ball4.png")))
+ (image-file "../images/groundpieces/ground/sortie/ball4.png"))
(sprite
(name "column")
- (image (file "../images/groundpieces/ground/sortie/column.png")))
+ (image-file "../images/groundpieces/ground/sortie/column.png"))
(sprite
(name "column2")
- (image (file "../images/groundpieces/ground/sortie/column2.png")))
+ (image-file "../images/groundpieces/ground/sortie/column2.png"))
(sprite
(name "column3")
- (image (file "../images/groundpieces/ground/sortie/column3.png")))
+ (image-file "../images/groundpieces/ground/sortie/column3.png"))
(sprite
(name "plate_forme")
- (image (file
"../images/groundpieces/ground/sortie/plate_forme.png")))
+ (image-file "../images/groundpieces/ground/sortie/plate_forme.png"))
(sprite
(name "plate_forme_left")
- (image (file
"../images/groundpieces/ground/sortie/plate_forme_left.png")))
+ (image-file
"../images/groundpieces/ground/sortie/plate_forme_left.png"))
(sprite
(name "plate_forme_right")
- (image (file
"../images/groundpieces/ground/sortie/plate_forme_right.png")))
+ (image-file
"../images/groundpieces/ground/sortie/plate_forme_right.png"))
(sprite
(name "tentacle1")
- (image (file "../images/groundpieces/ground/sortie/tentacle1.png")))
+ (image-file "../images/groundpieces/ground/sortie/tentacle1.png"))
)
(section (name "space")
(sprite
(name "block1")
- (image (file "../images/groundpieces/ground/space/block1.png")))
+ (image-file "../images/groundpieces/ground/space/block1.png"))
(sprite
(name "diagonal")
- (image (file "../images/groundpieces/ground/space/diagonal.png")))
+ (image-file "../images/groundpieces/ground/space/diagonal.png"))
(sprite
(name "diagonalr")
- (image (file "../images/groundpieces/ground/space/diagonalr.png")))
+ (image-file "../images/groundpieces/ground/space/diagonalr.png"))
(sprite
(name "smallblock1")
- (image (file "../images/groundpieces/ground/space/smallblock1.png")))
+ (image-file "../images/groundpieces/ground/space/smallblock1.png"))
(sprite
(name "smallblock2")
- (image (file "../images/groundpieces/ground/space/smallblock2.png")))
+ (image-file "../images/groundpieces/ground/space/smallblock2.png"))
(sprite
(name "smallblock3")
- (image (file "../images/groundpieces/ground/space/smallblock3.png")))
+ (image-file "../images/groundpieces/ground/space/smallblock3.png"))
(sprite
(name "smalltower")
- (image (file "../images/groundpieces/ground/space/smalltower.png")))
+ (image-file "../images/groundpieces/ground/space/smalltower.png"))
(sprite
(name "tower1")
- (image (file "../images/groundpieces/ground/space/tower1.png")))
+ (image-file "../images/groundpieces/ground/space/tower1.png"))
(sprite
(name "way")
- (image (file "../images/groundpieces/ground/space/way.png")))
+ (image-file "../images/groundpieces/ground/space/way.png"))
)
(section (name "sweets")
(sprite
(name "allsort1")
- (image (file "../images/groundpieces/ground/sweets/allsort1.png")))
+ (image-file "../images/groundpieces/ground/sweets/allsort1.png"))
(sprite
(name "allsort2")
- (image (file "../images/groundpieces/ground/sweets/allsort2.png")))
+ (image-file "../images/groundpieces/ground/sweets/allsort2.png"))
(sprite
(name "aquachoc")
- (image (file "../images/groundpieces/ground/sweets/aquachoc.png")))
+ (image-file "../images/groundpieces/ground/sweets/aquachoc.png"))
(sprite
(name "cake1")
- (image (file "../images/groundpieces/ground/sweets/cake1.png")))
+ (image-file "../images/groundpieces/ground/sweets/cake1.png"))
(sprite
(name "cake2")
- (image (file "../images/groundpieces/ground/sweets/cake2.png")))
+ (image-file "../images/groundpieces/ground/sweets/cake2.png"))
(sprite
(name "cake3")
- (image (file "../images/groundpieces/ground/sweets/cake3.png")))
+ (image-file "../images/groundpieces/ground/sweets/cake3.png"))
(sprite
(name "cake4")
- (image (file "../images/groundpieces/ground/sweets/cake4.png")))
+ (image-file "../images/groundpieces/ground/sweets/cake4.png"))
(sprite
(name "cake5")
- (image (file "../images/groundpieces/ground/sweets/cake5.png")))
+ (image-file "../images/groundpieces/ground/sweets/cake5.png"))
(sprite
(name "canestalk")
- (image (file "../images/groundpieces/ground/sweets/canestalk.png")))
+ (image-file "../images/groundpieces/ground/sweets/canestalk.png"))
(sprite
(name "canestub")
- (image (file "../images/groundpieces/ground/sweets/canestub.png")))
+ (image-file "../images/groundpieces/ground/sweets/canestub.png"))
(sprite
(name "canetop")
- (image (file "../images/groundpieces/ground/sweets/canetop.png")))
+ (image-file "../images/groundpieces/ground/sweets/canetop.png"))
(sprite
(name "chocbar")
- (image (file "../images/groundpieces/ground/sweets/chocbar.png")))
+ (image-file "../images/groundpieces/ground/sweets/chocbar.png"))
(sprite
(name "chocbloc-lowleft")
- (image (file
"../images/groundpieces/ground/sweets/chocbloc-lowleft.png")))
+ (image-file
"../images/groundpieces/ground/sweets/chocbloc-lowleft.png"))
(sprite
(name "chocbloc-lowright")
- (image (file
"../images/groundpieces/ground/sweets/chocbloc-lowright.png")))
+ (image-file
"../images/groundpieces/ground/sweets/chocbloc-lowright.png"))
(sprite
(name "chocbloc-topleft")
- (image (file
"../images/groundpieces/ground/sweets/chocbloc-topleft.png")))
+ (image-file
"../images/groundpieces/ground/sweets/chocbloc-topleft.png"))
(sprite
(name "chocbloc-topright")
- (image (file
"../images/groundpieces/ground/sweets/chocbloc-topright.png")))
+ (image-file
"../images/groundpieces/ground/sweets/chocbloc-topright.png"))
(sprite
(name "chocbloc")
- (image (file "../images/groundpieces/ground/sweets/chocbloc.png")))
+ (image-file "../images/groundpieces/ground/sweets/chocbloc.png"))
(sprite
(name "goldchoc")
- (image (file "../images/groundpieces/ground/sweets/goldchoc.png")))
+ (image-file "../images/groundpieces/ground/sweets/goldchoc.png"))
(sprite
(name "greenjellybaby")
- (image (file
"../images/groundpieces/ground/sweets/greenjellybaby.png")))
+ (image-file
"../images/groundpieces/ground/sweets/greenjellybaby.png"))
(sprite
(name "icecream")
- (image (file "../images/groundpieces/ground/sweets/icecream.png")))
+ (image-file "../images/groundpieces/ground/sweets/icecream.png"))
(sprite
(name "jube1")
- (image (file "../images/groundpieces/ground/sweets/jube1.png")))
+ (image-file "../images/groundpieces/ground/sweets/jube1.png"))
(sprite
(name "jube2")
- (image (file "../images/groundpieces/ground/sweets/jube2.png")))
+ (image-file "../images/groundpieces/ground/sweets/jube2.png"))
(sprite
(name "lollipop-purp")
- (image (file
"../images/groundpieces/ground/sweets/lollipop-purp.png")))
+ (image-file
"../images/groundpieces/ground/sweets/lollipop-purp.png"))
(sprite
(name "lollipop")
- (image (file "../images/groundpieces/ground/sweets/lollipop.png")))
+ (image-file "../images/groundpieces/ground/sweets/lollipop.png"))
(sprite
(name "mmblue")
- (image (file "../images/groundpieces/ground/sweets/mmblue.png")))
+ (image-file "../images/groundpieces/ground/sweets/mmblue.png"))
(sprite
(name "mmbrown")
- (image (file "../images/groundpieces/ground/sweets/mmbrown.png")))
+ (image-file "../images/groundpieces/ground/sweets/mmbrown.png"))
(sprite
(name "mmred")
- (image (file "../images/groundpieces/ground/sweets/mmred.png")))
+ (image-file "../images/groundpieces/ground/sweets/mmred.png"))
(sprite
(name "mmyellow")
- (image (file "../images/groundpieces/ground/sweets/mmyellow.png")))
+ (image-file "../images/groundpieces/ground/sweets/mmyellow.png"))
(sprite
(name "purpchoc")
- (image (file "../images/groundpieces/ground/sweets/purpchoc.png")))
+ (image-file "../images/groundpieces/ground/sweets/purpchoc.png"))
(sprite
(name "purplechoc")
- (image (file "../images/groundpieces/ground/sweets/purplechoc.png")))
+ (image-file "../images/groundpieces/ground/sweets/purplechoc.png"))
(sprite
(name "redjellybaby")
- (image (file
"../images/groundpieces/ground/sweets/redjellybaby.png")))
+ (image-file "../images/groundpieces/ground/sweets/redjellybaby.png"))
)
(section (name "test")
(sprite
(name "test1")
- (image (file "../images/groundpieces/ground/test/test1.png")))
+ (image-file "../images/groundpieces/ground/test/test1.png"))
(sprite
(name "test10")
- (image (file "../images/groundpieces/ground/test/test10.png")))
+ (image-file "../images/groundpieces/ground/test/test10.png"))
(sprite
(name "test2")
- (image (file "../images/groundpieces/ground/test/test2.png")))
+ (image-file "../images/groundpieces/ground/test/test2.png"))
(sprite
(name "test3")
- (image (file "../images/groundpieces/ground/test/test3.png")))
+ (image-file "../images/groundpieces/ground/test/test3.png"))
(sprite
(name "test4")
- (image (file "../images/groundpieces/ground/test/test4.png")))
+ (image-file "../images/groundpieces/ground/test/test4.png"))
(sprite
(name "test5")
- (image (file "../images/groundpieces/ground/test/test5.png")))
+ (image-file "../images/groundpieces/ground/test/test5.png"))
(sprite
(name "test6")
- (image (file "../images/groundpieces/ground/test/test6.png")))
+ (image-file "../images/groundpieces/ground/test/test6.png"))
(sprite
(name "test7")
- (image (file "../images/groundpieces/ground/test/test7.png")))
+ (image-file "../images/groundpieces/ground/test/test7.png"))
(sprite
(name "test8")
- (image (file "../images/groundpieces/ground/test/test8.png")))
+ (image-file "../images/groundpieces/ground/test/test8.png"))
(sprite
(name "test9")
- (image (file "../images/groundpieces/ground/test/test9.png")))
+ (image-file "../images/groundpieces/ground/test/test9.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/groundpieces-remove.res
===================================================================
--- branches/pingus_sdl/data/data/groundpieces-remove.res 2007-01-14
20:34:25 UTC (rev 2651)
+++ branches/pingus_sdl/data/data/groundpieces-remove.res 2007-01-14
23:59:43 UTC (rev 2652)
@@ -5,19 +5,19 @@
(section (name "misc")
(sprite
(name "column1")
- (image (file "../images/groundpieces/remove/misc/column1.png")))
+ (image-file "../images/groundpieces/remove/misc/column1.png"))
(sprite
(name "dia1")
- (image (file "../images/groundpieces/remove/misc/dia1.png")))
+ (image-file "../images/groundpieces/remove/misc/dia1.png"))
(sprite
(name "rect1")
- (image (file "../images/groundpieces/remove/misc/rect1.png")))
+ (image-file "../images/groundpieces/remove/misc/rect1.png"))
(sprite
(name "rect2")
- (image (file "../images/groundpieces/remove/misc/rect2.png")))
+ (image-file "../images/groundpieces/remove/misc/rect2.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/groundpieces-solid.res
===================================================================
--- branches/pingus_sdl/data/data/groundpieces-solid.res 2007-01-14
20:34:25 UTC (rev 2651)
+++ branches/pingus_sdl/data/data/groundpieces-solid.res 2007-01-14
23:59:43 UTC (rev 2652)
@@ -5,171 +5,171 @@
(section (name "crystal")
(sprite
(name "rectsolid")
- (image (file "../images/groundpieces/solid/crystal/rectsolid.png")))
+ (image-file "../images/groundpieces/solid/crystal/rectsolid.png"))
(sprite
(name "smallsolid")
- (image (file "../images/groundpieces/solid/crystal/smallsolid.png")))
+ (image-file "../images/groundpieces/solid/crystal/smallsolid.png"))
(sprite
(name "squaresolid")
- (image (file
"../images/groundpieces/solid/crystal/squaresolid.png")))
+ (image-file "../images/groundpieces/solid/crystal/squaresolid.png"))
)
(section (name "desert")
(sprite
(name "bigbrickpiece")
- (image (file
"../images/groundpieces/solid/desert/bigbrickpiece.png")))
+ (image-file "../images/groundpieces/solid/desert/bigbrickpiece.png"))
(sprite
(name "leftsmallbrick")
- (image (file
"../images/groundpieces/solid/desert/leftsmallbrick.png")))
+ (image-file
"../images/groundpieces/solid/desert/leftsmallbrick.png"))
(sprite
(name "middlebrickpiece")
- (image (file
"../images/groundpieces/solid/desert/middlebrickpiece.png")))
+ (image-file
"../images/groundpieces/solid/desert/middlebrickpiece.png"))
(sprite
(name "smallbrickpiece")
- (image (file
"../images/groundpieces/solid/desert/smallbrickpiece.png")))
+ (image-file
"../images/groundpieces/solid/desert/smallbrickpiece.png"))
)
(section (name "industrial")
(sprite
(name "greybri1")
- (image (file
"../images/groundpieces/solid/industrial/greybri1.png")))
+ (image-file "../images/groundpieces/solid/industrial/greybri1.png"))
(sprite
(name "greybri2")
- (image (file
"../images/groundpieces/solid/industrial/greybri2.png")))
+ (image-file "../images/groundpieces/solid/industrial/greybri2.png"))
(sprite
(name "greybri3")
- (image (file
"../images/groundpieces/solid/industrial/greybri3.png")))
+ (image-file "../images/groundpieces/solid/industrial/greybri3.png"))
(sprite
(name "greybri5")
- (image (file
"../images/groundpieces/solid/industrial/greybri5.png")))
+ (image-file "../images/groundpieces/solid/industrial/greybri5.png"))
(sprite
(name "joint1")
- (image (file "../images/groundpieces/solid/industrial/joint1.png")))
+ (image-file "../images/groundpieces/solid/industrial/joint1.png"))
(sprite
(name "joint2")
- (image (file "../images/groundpieces/solid/industrial/joint2.png")))
+ (image-file "../images/groundpieces/solid/industrial/joint2.png"))
(sprite
(name "joint3")
- (image (file "../images/groundpieces/solid/industrial/joint3.png")))
+ (image-file "../images/groundpieces/solid/industrial/joint3.png"))
(sprite
(name "joint4")
- (image (file "../images/groundpieces/solid/industrial/joint4.png")))
+ (image-file "../images/groundpieces/solid/industrial/joint4.png"))
(sprite
(name "joint5")
- (image (file "../images/groundpieces/solid/industrial/joint5.png")))
+ (image-file "../images/groundpieces/solid/industrial/joint5.png"))
(sprite
(name "rivet")
- (image (file "../images/groundpieces/solid/industrial/rivet.png")))
+ (image-file "../images/groundpieces/solid/industrial/rivet.png"))
(sprite
(name "screw")
- (image (file "../images/groundpieces/solid/industrial/screw.png")))
+ (image-file "../images/groundpieces/solid/industrial/screw.png"))
(sprite
(name "steel1")
- (image (file "../images/groundpieces/solid/industrial/steel1.png")))
+ (image-file "../images/groundpieces/solid/industrial/steel1.png"))
(sprite
(name "steel2")
- (image (file "../images/groundpieces/solid/industrial/steel2.png")))
+ (image-file "../images/groundpieces/solid/industrial/steel2.png"))
(sprite
(name "steel3")
- (image (file "../images/groundpieces/solid/industrial/steel3.png")))
+ (image-file "../images/groundpieces/solid/industrial/steel3.png"))
(sprite
(name "steel4")
- (image (file "../images/groundpieces/solid/industrial/steel4.png")))
+ (image-file "../images/groundpieces/solid/industrial/steel4.png"))
(sprite
(name "steel5")
- (image (file "../images/groundpieces/solid/industrial/steel5.png")))
+ (image-file "../images/groundpieces/solid/industrial/steel5.png"))
(sprite
(name "weld1")
- (image (file "../images/groundpieces/solid/industrial/weld1.png")))
+ (image-file "../images/groundpieces/solid/industrial/weld1.png"))
(sprite
(name "weld2")
- (image (file "../images/groundpieces/solid/industrial/weld2.png")))
+ (image-file "../images/groundpieces/solid/industrial/weld2.png"))
(sprite
(name "weld3")
- (image (file "../images/groundpieces/solid/industrial/weld3.png")))
+ (image-file "../images/groundpieces/solid/industrial/weld3.png"))
(sprite
(name "weld4")
- (image (file "../images/groundpieces/solid/industrial/weld4.png")))
+ (image-file "../images/groundpieces/solid/industrial/weld4.png"))
(sprite
(name "weld5")
- (image (file "../images/groundpieces/solid/industrial/weld5.png")))
+ (image-file "../images/groundpieces/solid/industrial/weld5.png"))
(sprite
(name "weld6")
- (image (file "../images/groundpieces/solid/industrial/weld6.png")))
+ (image-file "../images/groundpieces/solid/industrial/weld6.png"))
(sprite
(name "weld7")
- (image (file "../images/groundpieces/solid/industrial/weld7.png")))
+ (image-file "../images/groundpieces/solid/industrial/weld7.png"))
)
(section (name "misc")
(sprite
(name "metalplate_horiz")
- (image (file
"../images/groundpieces/solid/misc/metalplate_horiz.png")))
+ (image-file
"../images/groundpieces/solid/misc/metalplate_horiz.png"))
(sprite
(name "metalplate_large")
- (image (file
"../images/groundpieces/solid/misc/metalplate_large.png")))
+ (image-file
"../images/groundpieces/solid/misc/metalplate_large.png"))
(sprite
(name "metalplate_small")
- (image (file
"../images/groundpieces/solid/misc/metalplate_small.png")))
+ (image-file
"../images/groundpieces/solid/misc/metalplate_small.png"))
(sprite
(name "metalplate_vert")
- (image (file
"../images/groundpieces/solid/misc/metalplate_vert.png")))
+ (image-file "../images/groundpieces/solid/misc/metalplate_vert.png"))
)
(section (name "rock")
(sprite
(name "granit1")
- (image (file "../images/groundpieces/solid/rock/granit1.png")))
+ (image-file "../images/groundpieces/solid/rock/granit1.png"))
(sprite
(name "granit2")
- (image (file "../images/groundpieces/solid/rock/granit2.png")))
+ (image-file "../images/groundpieces/solid/rock/granit2.png"))
(sprite
(name "granit3")
- (image (file "../images/groundpieces/solid/rock/granit3.png")))
+ (image-file "../images/groundpieces/solid/rock/granit3.png"))
(sprite
(name "granit4")
- (image (file "../images/groundpieces/solid/rock/granit4.png")))
+ (image-file "../images/groundpieces/solid/rock/granit4.png"))
(sprite
(name "granit5")
- (image (file "../images/groundpieces/solid/rock/granit5.png")))
+ (image-file "../images/groundpieces/solid/rock/granit5.png"))
(sprite
(name "granit6")
- (image (file "../images/groundpieces/solid/rock/granit6.png")))
+ (image-file "../images/groundpieces/solid/rock/granit6.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/groundpieces-transparent.res
===================================================================
--- branches/pingus_sdl/data/data/groundpieces-transparent.res 2007-01-14
20:34:25 UTC (rev 2651)
+++ branches/pingus_sdl/data/data/groundpieces-transparent.res 2007-01-14
23:59:43 UTC (rev 2652)
@@ -5,221 +5,221 @@
(section (name "foliage")
(sprite
(name "grass1")
- (image (file
"../images/groundpieces/transparent/foliage/grass1.png")))
+ (image-file "../images/groundpieces/transparent/foliage/grass1.png"))
(sprite
(name "grass10")
- (image (file
"../images/groundpieces/transparent/foliage/grass10.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/grass10.png"))
(sprite
(name "grass11")
- (image (file
"../images/groundpieces/transparent/foliage/grass11.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/grass11.png"))
(sprite
(name "grass12")
- (image (file
"../images/groundpieces/transparent/foliage/grass12.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/grass12.png"))
(sprite
(name "grass13")
- (image (file
"../images/groundpieces/transparent/foliage/grass13.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/grass13.png"))
(sprite
(name "grass14")
- (image (file
"../images/groundpieces/transparent/foliage/grass14.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/grass14.png"))
(sprite
(name "grass15")
- (image (file
"../images/groundpieces/transparent/foliage/grass15.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/grass15.png"))
(sprite
(name "grass16")
- (image (file
"../images/groundpieces/transparent/foliage/grass16.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/grass16.png"))
(sprite
(name "grass2")
- (image (file
"../images/groundpieces/transparent/foliage/grass2.png")))
+ (image-file "../images/groundpieces/transparent/foliage/grass2.png"))
(sprite
(name "grass3")
- (image (file
"../images/groundpieces/transparent/foliage/grass3.png")))
+ (image-file "../images/groundpieces/transparent/foliage/grass3.png"))
(sprite
(name "grass4")
- (image (file
"../images/groundpieces/transparent/foliage/grass4.png")))
+ (image-file "../images/groundpieces/transparent/foliage/grass4.png"))
(sprite
(name "grass5")
- (image (file
"../images/groundpieces/transparent/foliage/grass5.png")))
+ (image-file "../images/groundpieces/transparent/foliage/grass5.png"))
(sprite
(name "grass6")
- (image (file
"../images/groundpieces/transparent/foliage/grass6.png")))
+ (image-file "../images/groundpieces/transparent/foliage/grass6.png"))
(sprite
(name "grass7")
- (image (file
"../images/groundpieces/transparent/foliage/grass7.png")))
+ (image-file "../images/groundpieces/transparent/foliage/grass7.png"))
(sprite
(name "grass8")
- (image (file
"../images/groundpieces/transparent/foliage/grass8.png")))
+ (image-file "../images/groundpieces/transparent/foliage/grass8.png"))
(sprite
(name "grass9")
- (image (file
"../images/groundpieces/transparent/foliage/grass9.png")))
+ (image-file "../images/groundpieces/transparent/foliage/grass9.png"))
(sprite
(name "turfconcave")
- (image (file
"../images/groundpieces/transparent/foliage/turfconcave.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/turfconcave.png"))
(sprite
(name "turfflat")
- (image (file
"../images/groundpieces/transparent/foliage/turfflat.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/turfflat.png"))
(sprite
(name "turfslopeleft")
- (image (file
"../images/groundpieces/transparent/foliage/turfslopeleft.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/turfslopeleft.png"))
(sprite
(name "turfslopeleft20")
- (image (file
"../images/groundpieces/transparent/foliage/turfslopeleft20.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/turfslopeleft20.png"))
(sprite
(name "turfsloperight")
- (image (file
"../images/groundpieces/transparent/foliage/turfsloperight.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/turfsloperight.png"))
(sprite
(name "turfsloperight20")
- (image (file
"../images/groundpieces/transparent/foliage/turfsloperight20.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/turfsloperight20.png"))
(sprite
(name "turfsmallbump")
- (image (file
"../images/groundpieces/transparent/foliage/turfsmallbump.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/turfsmallbump.png"))
(sprite
(name "turfsmallnook")
- (image (file
"../images/groundpieces/transparent/foliage/turfsmallnook.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/turfsmallnook.png"))
(sprite
(name "turftufty")
- (image (file
"../images/groundpieces/transparent/foliage/turftufty.png")))
+ (image-file
"../images/groundpieces/transparent/foliage/turftufty.png"))
)
(section (name "industrial")
(sprite
(name "gunge1")
- (image (file
"../images/groundpieces/transparent/industrial/gunge1.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge1.png"))
(sprite
(name "gunge10")
- (image (file
"../images/groundpieces/transparent/industrial/gunge10.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge10.png"))
(sprite
(name "gunge11")
- (image (file
"../images/groundpieces/transparent/industrial/gunge11.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge11.png"))
(sprite
(name "gunge12")
- (image (file
"../images/groundpieces/transparent/industrial/gunge12.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge12.png"))
(sprite
(name "gunge13")
- (image (file
"../images/groundpieces/transparent/industrial/gunge13.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge13.png"))
(sprite
(name "gunge14")
- (image (file
"../images/groundpieces/transparent/industrial/gunge14.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge14.png"))
(sprite
(name "gunge15")
- (image (file
"../images/groundpieces/transparent/industrial/gunge15.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge15.png"))
(sprite
(name "gunge2")
- (image (file
"../images/groundpieces/transparent/industrial/gunge2.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge2.png"))
(sprite
(name "gunge3")
- (image (file
"../images/groundpieces/transparent/industrial/gunge3.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge3.png"))
(sprite
(name "gunge4")
- (image (file
"../images/groundpieces/transparent/industrial/gunge4.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge4.png"))
(sprite
(name "gunge5")
- (image (file
"../images/groundpieces/transparent/industrial/gunge5.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge5.png"))
(sprite
(name "gunge6")
- (image (file
"../images/groundpieces/transparent/industrial/gunge6.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge6.png"))
(sprite
(name "gunge7")
- (image (file
"../images/groundpieces/transparent/industrial/gunge7.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge7.png"))
(sprite
(name "gunge8")
- (image (file
"../images/groundpieces/transparent/industrial/gunge8.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge8.png"))
(sprite
(name "gunge9")
- (image (file
"../images/groundpieces/transparent/industrial/gunge9.png")))
+ (image-file
"../images/groundpieces/transparent/industrial/gunge9.png"))
)
(section (name "misc")
(sprite
(name "flower")
- (image (file "../images/groundpieces/transparent/misc/flower.png")))
+ (image-file "../images/groundpieces/transparent/misc/flower.png"))
(sprite
(name "moos1")
- (image (file "../images/groundpieces/transparent/misc/moos1.png")))
+ (image-file "../images/groundpieces/transparent/misc/moos1.png"))
(sprite
(name "moos2")
- (image (file "../images/groundpieces/transparent/misc/moos2.png")))
+ (image-file "../images/groundpieces/transparent/misc/moos2.png"))
(sprite
(name "moos3")
- (image (file "../images/groundpieces/transparent/misc/moos3.png")))
+ (image-file "../images/groundpieces/transparent/misc/moos3.png"))
(sprite
(name "weed1")
- (image (file "../images/groundpieces/transparent/misc/weed1.png")))
+ (image-file "../images/groundpieces/transparent/misc/weed1.png"))
(sprite
(name "weed2")
- (image (file "../images/groundpieces/transparent/misc/weed2.png")))
+ (image-file "../images/groundpieces/transparent/misc/weed2.png"))
)
(section (name "snow")
(sprite
(name "grass1")
- (image (file "../images/groundpieces/transparent/snow/grass1.png")))
+ (image-file "../images/groundpieces/transparent/snow/grass1.png"))
(sprite
(name "grass2")
- (image (file "../images/groundpieces/transparent/snow/grass2.png")))
+ (image-file "../images/groundpieces/transparent/snow/grass2.png"))
(sprite
(name "grass3")
- (image (file "../images/groundpieces/transparent/snow/grass3.png")))
+ (image-file "../images/groundpieces/transparent/snow/grass3.png"))
(sprite
(name "grass4")
- (image (file "../images/groundpieces/transparent/snow/grass4.png")))
+ (image-file "../images/groundpieces/transparent/snow/grass4.png"))
(sprite
(name "grass5")
- (image (file "../images/groundpieces/transparent/snow/grass5.png")))
+ (image-file "../images/groundpieces/transparent/snow/grass5.png"))
(sprite
(name "plant1")
- (image (file "../images/groundpieces/transparent/snow/plant1.png")))
+ (image-file "../images/groundpieces/transparent/snow/plant1.png"))
(sprite
(name "plant2")
- (image (file "../images/groundpieces/transparent/snow/plant2.png")))
+ (image-file "../images/groundpieces/transparent/snow/plant2.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/hotspots.res
===================================================================
--- branches/pingus_sdl/data/data/hotspots.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/hotspots.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -4,145 +4,145 @@
(section (name "desert")
(sprite
(name "bigdimwall")
- (image (file "../images/hotspots/desert/bigdimwall.png")))
+ (image-file "../images/hotspots/desert/bigdimwall.png"))
(sprite
(name "mediumdimwall")
- (image (file "../images/hotspots/desert/mediumdimwall.png")))
+ (image-file "../images/hotspots/desert/mediumdimwall.png"))
(sprite
(name "mediumegyptpic")
- (image (file "../images/hotspots/desert/mediumegyptpic.png")))
+ (image-file "../images/hotspots/desert/mediumegyptpic.png"))
(sprite
(name "mediummummy")
- (image (file "../images/hotspots/desert/mediummummy.png")))
+ (image-file "../images/hotspots/desert/mediummummy.png"))
(sprite
(name "mediumsphinx")
- (image (file "../images/hotspots/desert/mediumsphinx.png")))
+ (image-file "../images/hotspots/desert/mediumsphinx.png"))
(sprite
(name "smallD")
- (image (file "../images/hotspots/desert/smallD.png")))
+ (image-file "../images/hotspots/desert/smallD.png"))
(sprite
(name "smallE")
- (image (file "../images/hotspots/desert/smallE.png")))
+ (image-file "../images/hotspots/desert/smallE.png"))
(sprite
(name "smallG")
- (image (file "../images/hotspots/desert/smallG.png")))
+ (image-file "../images/hotspots/desert/smallG.png"))
(sprite
(name "smallO")
- (image (file "../images/hotspots/desert/smallO.png")))
+ (image-file "../images/hotspots/desert/smallO.png"))
(sprite
(name "smalldimwall")
- (image (file "../images/hotspots/desert/smalldimwall.png")))
+ (image-file "../images/hotspots/desert/smalldimwall.png"))
(sprite
(name "smallegyptpic")
- (image (file "../images/hotspots/desert/smallegyptpic.png")))
+ (image-file "../images/hotspots/desert/smallegyptpic.png"))
(sprite
(name "smallmummy")
- (image (file "../images/hotspots/desert/smallmummy.png")))
+ (image-file "../images/hotspots/desert/smallmummy.png"))
(sprite
(name "smallsphinx")
- (image (file "../images/hotspots/desert/smallsphinx.png")))
+ (image-file "../images/hotspots/desert/smallsphinx.png"))
)
(section (name "misc")
(sprite
(name "bridge")
- (image (file "../images/hotspots/misc/bridge.png")))
+ (image-file "../images/hotspots/misc/bridge.png"))
(sprite
(name "tree")
- (image (file "../images/hotspots/misc/tree.png")))
+ (image-file "../images/hotspots/misc/tree.png"))
)
(section (name "signposts")
(sprite
(name "arrow_east")
- (image (file "../images/hotspots/signposts/arrow_east.png")))
+ (image-file "../images/hotspots/signposts/arrow_east.png"))
(sprite
(name "arrow_north")
- (image (file "../images/hotspots/signposts/arrow_north.png")))
+ (image-file "../images/hotspots/signposts/arrow_north.png"))
(sprite
(name "arrow_northeast")
- (image (file "../images/hotspots/signposts/arrow_northeast.png")))
+ (image-file "../images/hotspots/signposts/arrow_northeast.png"))
(sprite
(name "arrow_northwest")
- (image (file "../images/hotspots/signposts/arrow_northwest.png")))
+ (image-file "../images/hotspots/signposts/arrow_northwest.png"))
(sprite
(name "arrow_south")
- (image (file "../images/hotspots/signposts/arrow_south.png")))
+ (image-file "../images/hotspots/signposts/arrow_south.png"))
(sprite
(name "arrow_southeast")
- (image (file "../images/hotspots/signposts/arrow_southeast.png")))
+ (image-file "../images/hotspots/signposts/arrow_southeast.png"))
(sprite
(name "arrow_southwest")
- (image (file "../images/hotspots/signposts/arrow_southwest.png")))
+ (image-file "../images/hotspots/signposts/arrow_southwest.png"))
(sprite
(name "arrow_west")
- (image (file "../images/hotspots/signposts/arrow_west.png")))
+ (image-file "../images/hotspots/signposts/arrow_west.png"))
(sprite
(name "basher")
- (image (file "../images/hotspots/signposts/basher.png")))
+ (image-file "../images/hotspots/signposts/basher.png"))
(sprite
(name "blocker")
- (image (file "../images/hotspots/signposts/blocker.png")))
+ (image-file "../images/hotspots/signposts/blocker.png"))
(sprite
(name "bomber")
- (image (file "../images/hotspots/signposts/bomber.png")))
+ (image-file "../images/hotspots/signposts/bomber.png"))
(sprite
(name "bridger")
- (image (file "../images/hotspots/signposts/bridger.png")))
+ (image-file "../images/hotspots/signposts/bridger.png"))
(sprite
(name "climber")
- (image (file "../images/hotspots/signposts/climber.png")))
+ (image-file "../images/hotspots/signposts/climber.png"))
(sprite
(name "danger")
- (image (file "../images/hotspots/signposts/danger.png")))
+ (image-file "../images/hotspots/signposts/danger.png"))
(sprite
(name "digger")
- (image (file "../images/hotspots/signposts/digger.png")))
+ (image-file "../images/hotspots/signposts/digger.png"))
(sprite
(name "floater")
- (image (file "../images/hotspots/signposts/floater.png")))
+ (image-file "../images/hotspots/signposts/floater.png"))
(sprite
(name "miner")
- (image (file "../images/hotspots/signposts/miner.png")))
+ (image-file "../images/hotspots/signposts/miner.png"))
(sprite
(name "nogo")
- (image (file "../images/hotspots/signposts/nogo.png")))
+ (image-file "../images/hotspots/signposts/nogo.png"))
)
(section (name "space")
(sprite
(name "engine")
- (image (file "../images/hotspots/space/engine.png")))
+ (image-file "../images/hotspots/space/engine.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/liquids.res
===================================================================
--- branches/pingus_sdl/data/data/liquids.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/liquids.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -3,64 +3,64 @@
(section (name "liquids")
(sprite
(name "water_cmap")
- (image (file "../images/liquids/water_cmap.png")))
+ (image-file "../images/liquids/water_cmap.png"))
(sprite
(name "water")
- (image (file "../images/liquids/water.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/liquids/water.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "water2")
(speed 130)
- (image (file "../images/liquids/water2.png")
- (array 8 1)
- (size 64 64)
- (pos 0 0)))
+ (image-file "../images/liquids/water2.png")
+ (image-array 8 1)
+ (image-size 64 64)
+ (image-pos 0 0))
(sprite
(name "water3")
- (image (file "../images/liquids/water3.png")
- (array 8 1)
- (size 64 64)
- (pos 0 0)))
+ (image-file "../images/liquids/water3.png")
+ (image-array 8 1)
+ (image-size 64 64)
+ (image-pos 0 0))
(sprite
(name "water4")
- (image (file "../images/liquids/water4.png")
- (array 8 1)
- (size 64 64)
- (pos 0 0)))
+ (image-file "../images/liquids/water4.png")
+ (image-array 8 1)
+ (image-size 64 64)
+ (image-pos 0 0))
(sprite
(name "water5")
- (image (file "../images/liquids/water5.png")
- (array 4 1)
- (size 64 64)
- (pos 0 0)))
+ (image-file "../images/liquids/water5.png")
+ (image-array 4 1)
+ (image-size 64 64)
+ (image-pos 0 0))
(sprite
(name "swater")
- (image (file "../images/liquids/swater.png")
- (array 4 1)
- (size 64 64)
- (pos 0 0)))
+ (image-file "../images/liquids/swater.png")
+ (image-array 4 1)
+ (image-size 64 64)
+ (image-pos 0 0))
(sprite
(name "lava")
- (image (file "../images/liquids/lava.png")
- (array 12 1)
- (size 64 64)
- (pos 0 0)))
+ (image-file "../images/liquids/lava.png")
+ (image-array 12 1)
+ (image-size 64 64)
+ (image-pos 0 0))
(sprite
(name "slime")
- (image (file "../images/liquids/slime.png")
- (array 12 1)
- (size 64 64)
- (pos 0 0)))
+ (image-file "../images/liquids/slime.png")
+ (image-array 12 1)
+ (image-size 64 64)
+ (image-pos 0 0))
)
)
Modified: branches/pingus_sdl/data/data/particles.res
===================================================================
--- branches/pingus_sdl/data/data/particles.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/particles.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -3,71 +3,71 @@
(section (name "particles")
(sprite
(name "explosive")
- (image (file "../images/particles/explosive.png")))
+ (image-file "../images/particles/explosive.png"))
(sprite
(name "pingu_explo")
- (image (file "../images/particles/pingu_explo.png")
- (array 2 1)
- (size 3 3)
- (pos 0 0)))
+ (image-file "../images/particles/pingu_explo.png")
+ (image-array 2 1)
+ (image-size 3 3)
+ (image-pos 0 0))
(sprite
(name "ground")
- (image (file "../images/particles/ground.png")
- (array 4 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/particles/ground.png")
+ (image-array 4 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "smoke")
- (image (file "../images/particles/smoke.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/particles/smoke.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "smoke2")
- (image (file "../images/particles/smoke2.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/particles/smoke2.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "snow1")
- (image (file "../images/particles/snow1.png")))
+ (image-file "../images/particles/snow1.png"))
(sprite
(name "snow2")
- (image (file "../images/particles/snow2.png")))
+ (image-file "../images/particles/snow2.png"))
(sprite
(name "snow3")
- (image (file "../images/particles/snow3.png")))
+ (image-file "../images/particles/snow3.png"))
(sprite
(name "snow4")
- (image (file "../images/particles/snow4.png")))
+ (image-file "../images/particles/snow4.png"))
(sprite
(name "snow5")
- (image (file "../images/particles/snow5.png")))
+ (image-file "../images/particles/snow5.png"))
(sprite
(name "ground_snow")
- (image (file "../images/particles/ground_snow.png")))
+ (image-file "../images/particles/ground_snow.png"))
(sprite
(name "rain_splash")
- (image (file "../images/particles/rain_splash.png")))
+ (image-file "../images/particles/rain_splash.png"))
(sprite
(name "rain1")
- (image (file "../images/particles/rain1.png")))
+ (image-file "../images/particles/rain1.png"))
(sprite
(name "rain2")
- (image (file "../images/particles/rain2.png")))
+ (image-file "../images/particles/rain2.png"))
)
)
Modified: branches/pingus_sdl/data/data/pingus-common.res
===================================================================
--- branches/pingus_sdl/data/data/pingus-common.res 2007-01-14 20:34:25 UTC
(rev 2651)
+++ branches/pingus_sdl/data/data/pingus-common.res 2007-01-14 23:59:43 UTC
(rev 2652)
@@ -3,55 +3,55 @@
(section (name "other")
(sprite
(name "brick_right")
- (image (file "../images/pingus/common/brick_right.png")))
+ (image-file "../images/pingus/common/brick_right.png"))
(sprite
(name "brick_left")
- (image (file "../images/pingus/common/brick_left.png")))
+ (image-file "../images/pingus/common/brick_left.png"))
(sprite
(name "bash_radius")
- (image (file "../images/pingus/common/bash_radius.png")))
+ (image-file "../images/pingus/common/bash_radius.png"))
(sprite
(name "bash_radius_gfx")
- (image (file "../images/pingus/common/bash_radius_gfx.png")))
+ (image-file "../images/pingus/common/bash_radius_gfx.png"))
(sprite
(name "digger_radius")
- (image (file "../images/pingus/common/digger_radius.png")))
+ (image-file "../images/pingus/common/digger_radius.png"))
(sprite
(name "digger_radius_gfx")
- (image (file "../images/pingus/common/digger_radius_gfx.png")))
+ (image-file "../images/pingus/common/digger_radius_gfx.png"))
(sprite
(name "bomber_radius")
- (image (file "../images/pingus/common/bomber_radius.png")))
+ (image-file "../images/pingus/common/bomber_radius.png"))
(sprite
(name "bomber_radius_gfx")
- (image (file "../images/pingus/common/bomber_radius_gfx.png")))
+ (image-file "../images/pingus/common/bomber_radius_gfx.png"))
(sprite
(name "light")
- (image (file "../images/pingus/common/light.png"))
+ (image-file "../images/pingus/common/light.png")
(origin "center")
(offset 0 0))
(sprite
(name "splash")
- (image (file "../images/pingus/common/splash.png")
- (array 12 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/common/splash.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "splash_debris")
- (image (file "../images/pingus/common/splash_debris.png")
- (array 6 2)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/common/splash_debris.png")
+ (image-array 6 2)
+ (image-size 32 32)
+ (image-pos 0 0))
(section (name "laser_kill")
(sprite
@@ -60,10 +60,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/common/laser_kill.png")
- (array 9 1)
- (size 33 32)
- (pos 0 0)))
+ (image-file "../images/pingus/common/laser_kill.png")
+ (image-array 9 1)
+ (image-size 33 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -71,10 +71,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/common/laser_kill.png")
- (array 9 1)
- (size 33 32)
- (pos 0 32)))
+ (image-file "../images/pingus/common/laser_kill.png")
+ (image-array 9 1)
+ (image-size 33 32)
+ (image-pos 0 32))
)
(section (name "floaterlayer")
@@ -82,29 +82,29 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/common/floaterlayer.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/common/floaterlayer.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/common/floaterlayer.png")
- (array 8 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/common/floaterlayer.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
)
(section (name "XMas")
(sprite
(name "walker")
- (image (file "../images/pingus/common/xmas-walker.png")
- (array 8 2)
- (size 32 44)
- (pos 0 0)))
+ (image-file "../images/pingus/common/xmas-walker.png")
+ (image-array 8 2)
+ (image-size 32 44)
+ (image-pos 0 0))
)
)
Modified: branches/pingus_sdl/data/data/pingus-player0.res
===================================================================
--- branches/pingus_sdl/data/data/pingus-player0.res 2007-01-14 20:34:25 UTC
(rev 2651)
+++ branches/pingus_sdl/data/data/pingus-player0.res 2007-01-14 23:59:43 UTC
(rev 2652)
@@ -9,10 +9,10 @@
(speed 50)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/rocketlauncher.png")
- (array 7 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/rocketlauncher.png")
+ (image-array 7 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -20,41 +20,41 @@
(speed 50)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/rocketlauncher.png")
- (array 7 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player0/rocketlauncher.png")
+ (image-array 7 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "boarder")
(sprite
(name "left")
- (image (file "../images/pingus/player0/boarder.png")
- (array 1 1)
- (size 30 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/boarder.png")
+ (image-array 1 1)
+ (image-size 30 30)
+ (image-pos 0 0))
(sprite
(name "right")
- (image (file "../images/pingus/player0/boarder.png")
- (array 1 1)
- (size 30 30)
- (pos 0 30)))
+ (image-file "../images/pingus/player0/boarder.png")
+ (image-array 1 1)
+ (image-size 30 30)
+ (image-pos 0 30))
)
(sprite
(name "angel")
- (image (file "../images/pingus/player0/angel.png")
- (array 4 1)
- (size 46 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/angel.png")
+ (image-array 4 1)
+ (image-size 46 30)
+ (image-pos 0 0))
(sprite
(name "superman")
- (image (file "../images/pingus/player0/superman.png")
- (array 8 1)
- (size 30 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/superman.png")
+ (image-array 8 1)
+ (image-size 30 30)
+ (image-pos 0 0))
(section (name "bomber")
(sprite
@@ -63,10 +63,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/bomber.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/bomber.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -74,10 +74,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/bomber.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/bomber.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "basher")
@@ -85,19 +85,19 @@
(name "left")
(origin "bottom_center")
(offset 0 1)
- (image (file "../images/pingus/player0/basher.png")
- (array 12 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/basher.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 1)
- (image (file "../images/pingus/player0/basher.png")
- (array 12 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player0/basher.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "climber")
@@ -105,19 +105,19 @@
(name "left")
(origin "bottom_center")
(offset 16 2)
- (image (file "../images/pingus/player0/climber.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/climber.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset -14 2)
- (image (file "../images/pingus/player0/climber.png")
- (array 8 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player0/climber.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "faller")
@@ -125,19 +125,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "jumper")
@@ -145,19 +145,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "tumbler")
@@ -165,19 +165,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/tumble.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/tumble.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/tumble.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/tumble.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "bridger")
@@ -187,10 +187,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/bridger.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/bridger.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -198,10 +198,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/bridger.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player0/bridger.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "bridger_walk")
@@ -211,10 +211,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/bridger_walk.png")
- (array 4 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/bridger_walk.png")
+ (image-array 4 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -222,10 +222,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/bridger_walk.png")
- (array 4 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player0/bridger_walk.png")
+ (image-array 4 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "walker")
@@ -234,20 +234,20 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/walker.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/walker.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/walker.png")
- (array 8 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player0/walker.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "blocker")
@@ -255,19 +255,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/blocker.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/blocker.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/blocker.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/blocker.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "floater")
@@ -275,19 +275,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/floater.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/floater.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/floater.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/floater.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "digger")
@@ -295,19 +295,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/digger.png")
- (array 14 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/digger.png")
+ (image-array 14 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/digger.png")
- (array 14 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/digger.png")
+ (image-array 14 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "miner")
@@ -315,19 +315,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/miner.png")
- (array 12 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/miner.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/miner.png")
- (array 12 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player0/miner.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(sprite
@@ -336,10 +336,10 @@
(offset 0 2)
(loop #f)
(speed 33)
- (image (file "../images/pingus/player0/splat.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/splat.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(section (name "exit")
(sprite
@@ -348,10 +348,10 @@
(speed 60)
(origin "bottom_center")
(offset -2 2)
- (image (file "../images/pingus/player0/exit.png")
- (array 9 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/exit.png")
+ (image-array 9 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -359,10 +359,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/exit.png")
- (array 9 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player0/exit.png")
+ (image-array 9 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "drownfall")
@@ -372,10 +372,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/drownfall.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/drownfall.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -383,10 +383,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/drownfall.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player0/drownfall.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "drownwalk")
@@ -394,19 +394,19 @@
(name "left")
(loop #f)
(speed 60)
- (image (file "../images/pingus/player0/drownwalk.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/drownwalk.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(loop #f)
(speed 60)
- (image (file "../images/pingus/player0/drownwalk.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player0/drownwalk.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "waiter")
@@ -414,19 +414,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/waiter.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/waiter.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/waiter.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/waiter.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "slider")
@@ -434,24 +434,24 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/slider.png")
- (array 1 1)
- (size 32 15)
- (pos 0 0)))
+ (image-file "../images/pingus/player0/slider.png")
+ (image-array 1 1)
+ (image-size 32 15)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player0/slider.png")
- (array 1 1)
- (size 32 15)
- (pos 0 15)))
+ (image-file "../images/pingus/player0/slider.png")
+ (image-array 1 1)
+ (image-size 32 15)
+ (image-pos 0 15))
)
(sprite
(name "explo")
- (image (file "../images/pingus/player0/explo.png")))
+ (image-file "../images/pingus/player0/explo.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/pingus-player1.res
===================================================================
--- branches/pingus_sdl/data/data/pingus-player1.res 2007-01-14 20:34:25 UTC
(rev 2651)
+++ branches/pingus_sdl/data/data/pingus-player1.res 2007-01-14 23:59:43 UTC
(rev 2652)
@@ -9,10 +9,10 @@
(speed 50)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/rocketlauncher.png")
- (array 7 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/rocketlauncher.png")
+ (image-array 7 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -20,41 +20,41 @@
(speed 50)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/rocketlauncher.png")
- (array 7 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player1/rocketlauncher.png")
+ (image-array 7 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "boarder")
(sprite
(name "left")
- (image (file "../images/pingus/player1/boarder.png")
- (array 1 1)
- (size 30 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/boarder.png")
+ (image-array 1 1)
+ (image-size 30 30)
+ (image-pos 0 0))
(sprite
(name "right")
- (image (file "../images/pingus/player1/boarder.png")
- (array 1 1)
- (size 30 30)
- (pos 0 30)))
+ (image-file "../images/pingus/player1/boarder.png")
+ (image-array 1 1)
+ (image-size 30 30)
+ (image-pos 0 30))
)
(sprite
(name "angel")
- (image (file "../images/pingus/player1/angel.png")
- (array 4 1)
- (size 46 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/angel.png")
+ (image-array 4 1)
+ (image-size 46 30)
+ (image-pos 0 0))
(sprite
(name "superman")
- (image (file "../images/pingus/player1/superman.png")
- (array 8 1)
- (size 30 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/superman.png")
+ (image-array 8 1)
+ (image-size 30 30)
+ (image-pos 0 0))
(section (name "bomber")
(sprite
@@ -63,10 +63,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/bomber.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/bomber.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -74,10 +74,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/bomber.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/bomber.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "basher")
@@ -85,19 +85,19 @@
(name "left")
(origin "bottom_center")
(offset 0 1)
- (image (file "../images/pingus/player1/basher.png")
- (array 12 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/basher.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 1)
- (image (file "../images/pingus/player1/basher.png")
- (array 12 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player1/basher.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "climber")
@@ -105,19 +105,19 @@
(name "left")
(origin "bottom_center")
(offset 16 2)
- (image (file "../images/pingus/player1/climber.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/climber.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset -14 2)
- (image (file "../images/pingus/player1/climber.png")
- (array 8 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player1/climber.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "faller")
@@ -125,19 +125,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "jumper")
@@ -145,19 +145,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "tumbler")
@@ -165,19 +165,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/tumble.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/tumble.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/tumble.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/tumble.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "bridger")
@@ -187,10 +187,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/bridger.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/bridger.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -198,10 +198,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/bridger.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player1/bridger.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "bridger_walk")
@@ -211,10 +211,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/bridger_walk.png")
- (array 4 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/bridger_walk.png")
+ (image-array 4 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -222,10 +222,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/bridger_walk.png")
- (array 4 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player1/bridger_walk.png")
+ (image-array 4 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "walker")
@@ -234,20 +234,20 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/walker.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/walker.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/walker.png")
- (array 8 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player1/walker.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "blocker")
@@ -255,19 +255,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/blocker.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/blocker.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/blocker.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/blocker.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "floater")
@@ -275,19 +275,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/floater.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/floater.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/floater.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/floater.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "digger")
@@ -295,19 +295,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/digger.png")
- (array 14 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/digger.png")
+ (image-array 14 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/digger.png")
- (array 14 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/digger.png")
+ (image-array 14 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "miner")
@@ -315,19 +315,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/miner.png")
- (array 12 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/miner.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/miner.png")
- (array 12 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player1/miner.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(sprite
@@ -336,10 +336,10 @@
(offset 0 2)
(loop #f)
(speed 33)
- (image (file "../images/pingus/player1/splat.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/splat.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(section (name "exit")
(sprite
@@ -348,10 +348,10 @@
(speed 60)
(origin "bottom_center")
(offset -2 2)
- (image (file "../images/pingus/player1/exit.png")
- (array 9 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/exit.png")
+ (image-array 9 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -359,10 +359,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/exit.png")
- (array 9 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player1/exit.png")
+ (image-array 9 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "drownfall")
@@ -372,10 +372,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/drownfall.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/drownfall.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -383,10 +383,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/drownfall.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player1/drownfall.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "drownwalk")
@@ -394,19 +394,19 @@
(name "left")
(loop #f)
(speed 60)
- (image (file "../images/pingus/player1/drownwalk.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/drownwalk.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(loop #f)
(speed 60)
- (image (file "../images/pingus/player1/drownwalk.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player1/drownwalk.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "waiter")
@@ -414,19 +414,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/waiter.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/waiter.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/waiter.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/waiter.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "slider")
@@ -434,24 +434,24 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/slider.png")
- (array 1 1)
- (size 32 15)
- (pos 0 0)))
+ (image-file "../images/pingus/player1/slider.png")
+ (image-array 1 1)
+ (image-size 32 15)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player1/slider.png")
- (array 1 1)
- (size 32 15)
- (pos 0 15)))
+ (image-file "../images/pingus/player1/slider.png")
+ (image-array 1 1)
+ (image-size 32 15)
+ (image-pos 0 15))
)
(sprite
(name "explo")
- (image (file "../images/pingus/player1/explo.png")))
+ (image-file "../images/pingus/player1/explo.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/pingus-player2.res
===================================================================
--- branches/pingus_sdl/data/data/pingus-player2.res 2007-01-14 20:34:25 UTC
(rev 2651)
+++ branches/pingus_sdl/data/data/pingus-player2.res 2007-01-14 23:59:43 UTC
(rev 2652)
@@ -9,10 +9,10 @@
(speed 50)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/rocketlauncher.png")
- (array 7 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/rocketlauncher.png")
+ (image-array 7 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -20,41 +20,41 @@
(speed 50)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/rocketlauncher.png")
- (array 7 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player2/rocketlauncher.png")
+ (image-array 7 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "boarder")
(sprite
(name "left")
- (image (file "../images/pingus/player2/boarder.png")
- (array 1 1)
- (size 30 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/boarder.png")
+ (image-array 1 1)
+ (image-size 30 30)
+ (image-pos 0 0))
(sprite
(name "right")
- (image (file "../images/pingus/player2/boarder.png")
- (array 1 1)
- (size 30 30)
- (pos 0 30)))
+ (image-file "../images/pingus/player2/boarder.png")
+ (image-array 1 1)
+ (image-size 30 30)
+ (image-pos 0 30))
)
(sprite
(name "angel")
- (image (file "../images/pingus/player2/angel.png")
- (array 4 1)
- (size 46 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/angel.png")
+ (image-array 4 1)
+ (image-size 46 30)
+ (image-pos 0 0))
(sprite
(name "superman")
- (image (file "../images/pingus/player2/superman.png")
- (array 8 1)
- (size 30 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/superman.png")
+ (image-array 8 1)
+ (image-size 30 30)
+ (image-pos 0 0))
(section (name "bomber")
(sprite
@@ -63,10 +63,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/bomber.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/bomber.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -74,10 +74,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/bomber.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/bomber.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "basher")
@@ -85,19 +85,19 @@
(name "left")
(origin "bottom_center")
(offset 0 1)
- (image (file "../images/pingus/player2/basher.png")
- (array 12 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/basher.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 1)
- (image (file "../images/pingus/player2/basher.png")
- (array 12 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player2/basher.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "climber")
@@ -105,19 +105,19 @@
(name "left")
(origin "bottom_center")
(offset 16 2)
- (image (file "../images/pingus/player2/climber.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/climber.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset -14 2)
- (image (file "../images/pingus/player2/climber.png")
- (array 8 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player2/climber.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "faller")
@@ -125,19 +125,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "jumper")
@@ -145,19 +145,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "tumbler")
@@ -165,19 +165,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/tumble.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/tumble.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/tumble.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/tumble.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "bridger")
@@ -187,10 +187,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/bridger.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/bridger.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -198,10 +198,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/bridger.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player2/bridger.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "bridger_walk")
@@ -211,10 +211,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/bridger_walk.png")
- (array 4 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/bridger_walk.png")
+ (image-array 4 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -222,10 +222,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/bridger_walk.png")
- (array 4 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player2/bridger_walk.png")
+ (image-array 4 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "walker")
@@ -234,20 +234,20 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/walker.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/walker.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/walker.png")
- (array 8 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player2/walker.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "blocker")
@@ -255,19 +255,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/blocker.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/blocker.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/blocker.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/blocker.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "floater")
@@ -275,19 +275,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/floater.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/floater.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/floater.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/floater.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "digger")
@@ -295,19 +295,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/digger.png")
- (array 14 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/digger.png")
+ (image-array 14 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/digger.png")
- (array 14 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/digger.png")
+ (image-array 14 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "miner")
@@ -315,19 +315,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/miner.png")
- (array 12 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/miner.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/miner.png")
- (array 12 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player2/miner.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(sprite
@@ -336,10 +336,10 @@
(offset 0 2)
(loop #f)
(speed 33)
- (image (file "../images/pingus/player2/splat.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/splat.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(section (name "exit")
(sprite
@@ -348,10 +348,10 @@
(speed 60)
(origin "bottom_center")
(offset -2 2)
- (image (file "../images/pingus/player2/exit.png")
- (array 9 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/exit.png")
+ (image-array 9 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -359,10 +359,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/exit.png")
- (array 9 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player2/exit.png")
+ (image-array 9 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "drownfall")
@@ -372,10 +372,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/drownfall.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/drownfall.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -383,10 +383,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/drownfall.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player2/drownfall.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "drownwalk")
@@ -394,19 +394,19 @@
(name "left")
(loop #f)
(speed 60)
- (image (file "../images/pingus/player2/drownwalk.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/drownwalk.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(loop #f)
(speed 60)
- (image (file "../images/pingus/player2/drownwalk.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player2/drownwalk.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "waiter")
@@ -414,19 +414,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/waiter.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/waiter.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/waiter.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/waiter.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "slider")
@@ -434,24 +434,24 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/slider.png")
- (array 1 1)
- (size 32 15)
- (pos 0 0)))
+ (image-file "../images/pingus/player2/slider.png")
+ (image-array 1 1)
+ (image-size 32 15)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player2/slider.png")
- (array 1 1)
- (size 32 15)
- (pos 0 15)))
+ (image-file "../images/pingus/player2/slider.png")
+ (image-array 1 1)
+ (image-size 32 15)
+ (image-pos 0 15))
)
(sprite
(name "explo")
- (image (file "../images/pingus/player2/explo.png")))
+ (image-file "../images/pingus/player2/explo.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/pingus-player3.res
===================================================================
--- branches/pingus_sdl/data/data/pingus-player3.res 2007-01-14 20:34:25 UTC
(rev 2651)
+++ branches/pingus_sdl/data/data/pingus-player3.res 2007-01-14 23:59:43 UTC
(rev 2652)
@@ -9,10 +9,10 @@
(speed 50)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/rocketlauncher.png")
- (array 7 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/rocketlauncher.png")
+ (image-array 7 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -20,41 +20,41 @@
(speed 50)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/rocketlauncher.png")
- (array 7 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player3/rocketlauncher.png")
+ (image-array 7 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "boarder")
(sprite
(name "left")
- (image (file "../images/pingus/player3/boarder.png")
- (array 1 1)
- (size 30 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/boarder.png")
+ (image-array 1 1)
+ (image-size 30 30)
+ (image-pos 0 0))
(sprite
(name "right")
- (image (file "../images/pingus/player3/boarder.png")
- (array 1 1)
- (size 30 30)
- (pos 0 30)))
+ (image-file "../images/pingus/player3/boarder.png")
+ (image-array 1 1)
+ (image-size 30 30)
+ (image-pos 0 30))
)
(sprite
(name "angel")
- (image (file "../images/pingus/player3/angel.png")
- (array 4 1)
- (size 46 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/angel.png")
+ (image-array 4 1)
+ (image-size 46 30)
+ (image-pos 0 0))
(sprite
(name "superman")
- (image (file "../images/pingus/player3/superman.png")
- (array 8 1)
- (size 30 30)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/superman.png")
+ (image-array 8 1)
+ (image-size 30 30)
+ (image-pos 0 0))
(section (name "bomber")
(sprite
@@ -63,10 +63,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/bomber.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/bomber.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -74,10 +74,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/bomber.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/bomber.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "basher")
@@ -85,19 +85,19 @@
(name "left")
(origin "bottom_center")
(offset 0 1)
- (image (file "../images/pingus/player3/basher.png")
- (array 12 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/basher.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 1)
- (image (file "../images/pingus/player3/basher.png")
- (array 12 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player3/basher.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "climber")
@@ -105,19 +105,19 @@
(name "left")
(origin "bottom_center")
(offset 16 2)
- (image (file "../images/pingus/player3/climber.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/climber.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset -14 2)
- (image (file "../images/pingus/player3/climber.png")
- (array 8 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player3/climber.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "faller")
@@ -125,19 +125,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "jumper")
@@ -145,19 +145,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/faller.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/faller.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "tumbler")
@@ -165,19 +165,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/tumble.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/tumble.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/tumble.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/tumble.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "bridger")
@@ -187,10 +187,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/bridger.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/bridger.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -198,10 +198,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/bridger.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player3/bridger.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "bridger_walk")
@@ -211,10 +211,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/bridger_walk.png")
- (array 4 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/bridger_walk.png")
+ (image-array 4 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -222,10 +222,10 @@
(speed 66)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/bridger_walk.png")
- (array 4 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player3/bridger_walk.png")
+ (image-array 4 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "walker")
@@ -234,20 +234,20 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/walker.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/walker.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/walker.png")
- (array 8 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player3/walker.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "blocker")
@@ -255,19 +255,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/blocker.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/blocker.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/blocker.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/blocker.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "floater")
@@ -275,19 +275,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/floater.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/floater.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/floater.png")
- (array 8 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/floater.png")
+ (image-array 8 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "digger")
@@ -295,19 +295,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/digger.png")
- (array 14 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/digger.png")
+ (image-array 14 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/digger.png")
- (array 14 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/digger.png")
+ (image-array 14 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "miner")
@@ -315,19 +315,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/miner.png")
- (array 12 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/miner.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/miner.png")
- (array 12 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player3/miner.png")
+ (image-array 12 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(sprite
@@ -336,10 +336,10 @@
(offset 0 2)
(loop #f)
(speed 33)
- (image (file "../images/pingus/player3/splat.png")
- (array 16 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/splat.png")
+ (image-array 16 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(section (name "exit")
(sprite
@@ -348,10 +348,10 @@
(speed 60)
(origin "bottom_center")
(offset -2 2)
- (image (file "../images/pingus/player3/exit.png")
- (array 9 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/exit.png")
+ (image-array 9 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -359,10 +359,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/exit.png")
- (array 9 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player3/exit.png")
+ (image-array 9 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "drownfall")
@@ -372,10 +372,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/drownfall.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/drownfall.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
@@ -383,10 +383,10 @@
(speed 60)
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/drownfall.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player3/drownfall.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "drownwalk")
@@ -394,19 +394,19 @@
(name "left")
(loop #f)
(speed 60)
- (image (file "../images/pingus/player3/drownwalk.png")
- (array 15 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/drownwalk.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(loop #f)
(speed 60)
- (image (file "../images/pingus/player3/drownwalk.png")
- (array 15 1)
- (size 32 32)
- (pos 0 32)))
+ (image-file "../images/pingus/player3/drownwalk.png")
+ (image-array 15 1)
+ (image-size 32 32)
+ (image-pos 0 32))
)
(section (name "waiter")
@@ -414,19 +414,19 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/waiter.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/waiter.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/waiter.png")
- (array 6 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/waiter.png")
+ (image-array 6 1)
+ (image-size 32 32)
+ (image-pos 0 0))
)
(section (name "slider")
@@ -434,24 +434,24 @@
(name "left")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/slider.png")
- (array 1 1)
- (size 32 15)
- (pos 0 0)))
+ (image-file "../images/pingus/player3/slider.png")
+ (image-array 1 1)
+ (image-size 32 15)
+ (image-pos 0 0))
(sprite
(name "right")
(origin "bottom_center")
(offset 0 2)
- (image (file "../images/pingus/player3/slider.png")
- (array 1 1)
- (size 32 15)
- (pos 0 15)))
+ (image-file "../images/pingus/player3/slider.png")
+ (image-array 1 1)
+ (image-size 32 15)
+ (image-pos 0 15))
)
(sprite
(name "explo")
- (image (file "../images/pingus/player3/explo.png")))
+ (image-file "../images/pingus/player3/explo.png"))
)
)
)
Modified: branches/pingus_sdl/data/data/story.res
===================================================================
--- branches/pingus_sdl/data/data/story.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/story.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -5,73 +5,73 @@
(name "story0")
(origin "center")
(offset 0 0)
- (image (file "../images/story/story0.png")))
+ (image-file "../images/story/story0.png"))
(sprite
(name "story1")
(origin "center")
(offset 0 0)
- (image (file "../images/story/story1.png")))
+ (image-file "../images/story/story1.png"))
(sprite
(name "story2")
(origin "center")
(offset 0 0)
- (image (file "../images/story/story2.png")))
+ (image-file "../images/story/story2.png"))
(sprite
(name "story3")
(origin "center")
(offset 0 0)
- (image (file "../images/story/story3.png")))
+ (image-file "../images/story/story3.png"))
(sprite
(name "story4")
(origin "center")
(offset 0 0)
- (image (file "../images/story/story4.png")))
+ (image-file "../images/story/story4.png"))
(sprite
(name "story5")
(origin "center")
(offset 0 0)
- (image (file "../images/story/story5.png")))
+ (image-file "../images/story/story5.png"))
(sprite
(name "story6")
(origin "center")
(offset 0 0)
- (image (file "../images/story/story6.png")))
+ (image-file "../images/story/story6.png"))
(sprite
(name "credits1")
(origin "center")
(offset 0 0)
- (image (file "../images/story/credits1.png")))
+ (image-file "../images/story/credits1.png"))
(sprite
(name "credits2")
(origin "center")
(offset 0 0)
- (image (file "../images/story/credits2.png")))
+ (image-file "../images/story/credits2.png"))
(sprite
(name "credits3")
(origin "center")
(offset 0 0)
- (image (file "../images/story/credits3.png")))
+ (image-file "../images/story/credits3.png"))
(sprite
(name "credits4")
(origin "center")
(offset 0 0)
- (image (file "../images/story/credits4.png")))
+ (image-file "../images/story/credits4.png"))
(sprite
(name "background")
(origin "center")
(offset 0 0)
- (image (file "../images/core/menu/worldscreenbg.jpg")))
+ (image-file "../images/core/menu/worldscreenbg.jpg"))
)
)
Modified: branches/pingus_sdl/data/data/textures.res
===================================================================
--- branches/pingus_sdl/data/data/textures.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/textures.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -3,162 +3,162 @@
(section (name "textures")
(sprite
(name "fruitcaketile")
- (image (file "../images/textures/fruitcaketile.jpg")))
+ (image-file "../images/textures/fruitcaketile.jpg"))
(sprite
(name "default")
- (image (file "../images/textures/default.png")))
+ (image-file "../images/textures/default.png"))
(sprite
(name "industrial")
- (image (file "../images/textures/industrial.jpg")))
+ (image-file "../images/textures/industrial.jpg"))
(sprite
(name "clouds2")
- (image (file "../images/textures/clouds2.jpg")))
+ (image-file "../images/textures/clouds2.jpg"))
(sprite
(name "clouds3")
- (image (file "../images/textures/clouds3.png")))
+ (image-file "../images/textures/clouds3.png"))
(sprite
(name "clouds")
- (image (file "../images/textures/clouds.jpg")))
+ (image-file "../images/textures/clouds.jpg"))
(sprite
(name "crystal")
- (image (file "../images/textures/crystal.jpg")))
+ (image-file "../images/textures/crystal.jpg"))
(sprite
(name "stone")
- (image (file "../images/textures/stones.png")))
+ (image-file "../images/textures/stones.png"))
(sprite
(name "rocktile")
- (image (file "../images/textures/rocktile.jpg")))
+ (image-file "../images/textures/rocktile.jpg"))
(sprite
(name "rooftile")
- (image (file "../images/textures/rooftile.jpg")))
+ (image-file "../images/textures/rooftile.jpg"))
(sprite
(name "rooftile2")
- (image (file "../images/textures/rooftile2.jpg")))
+ (image-file "../images/textures/rooftile2.jpg"))
(sprite
(name "greentex")
- (image (file "../images/textures/greentex.jpg")))
+ (image-file "../images/textures/greentex.jpg"))
(sprite
(name "rock6")
- (image (file "../images/textures/rock6.jpg")))
+ (image-file "../images/textures/rock6.jpg"))
(sprite
(name "rockagglo")
- (image (file "../images/textures/rockagglo.jpg")))
+ (image-file "../images/textures/rockagglo.jpg"))
(sprite
(name "icetile")
- (image (file "../images/textures/icetile.jpg")))
+ (image-file "../images/textures/icetile.jpg"))
(sprite
(name "lunartile")
- (image (file "../images/textures/lunartile.jpg")))
+ (image-file "../images/textures/lunartile.jpg"))
(sprite
(name "blueflame")
- (image (file "../images/textures/blueflame.jpg")))
+ (image-file "../images/textures/blueflame.jpg"))
(sprite
(name "stones")
- (image (file "../images/textures/stone.jpg")))
+ (image-file "../images/textures/stone.jpg"))
(sprite
(name "flame")
- (image (file "../images/textures/flamebg.jpg")))
+ (image-file "../images/textures/flamebg.jpg"))
(sprite
(name "anim_fire")
- (image (file "../images/textures/anim_fire.jpg")
- (array 15 1)
- (size 64 590)
- (pos 0 0)))
+ (image-file "../images/textures/anim_fire.jpg")
+ (image-array 15 1)
+ (image-size 64 590)
+ (image-pos 0 0))
(sprite
(name "stars")
- (image (file "../images/textures/stars.jpg")))
+ (image-file "../images/textures/stars.jpg"))
(sprite
(name "enchantedjungle")
- (image (file "../images/textures/enchantedjungle.jpg")))
+ (image-file "../images/textures/enchantedjungle.jpg"))
(sprite
(name "darkjungle")
- (image (file "../images/textures/darkjungle.jpg")))
+ (image-file "../images/textures/darkjungle.jpg"))
(sprite
(name "latejungle")
- (image (file "../images/textures/latejungle.jpg")))
+ (image-file "../images/textures/latejungle.jpg"))
(sprite
(name "nightjungle")
- (image (file "../images/textures/nightjungle.jpg")))
+ (image-file "../images/textures/nightjungle.jpg"))
(sprite
(name "happyclouds")
- (image (file "../images/textures/happyclouds.jpg")))
+ (image-file "../images/textures/happyclouds.jpg"))
(sprite
(name "desert")
- (image (file "../images/textures/desert.jpg")))
+ (image-file "../images/textures/desert.jpg"))
(sprite
(name "desert_room")
- (image (file "../images/textures/desert_room.jpg")))
+ (image-file "../images/textures/desert_room.jpg"))
(sprite
(name "sortie")
- (image (file "../images/textures/sortie.jpg")))
+ (image-file "../images/textures/sortie.jpg"))
(sprite
(name "cyanspace")
- (image (file "../images/textures/cyanspace.jpg")))
+ (image-file "../images/textures/cyanspace.jpg"))
(sprite
(name "bwsortiebg")
- (image (file "../images/textures/bwsortiebg.jpg")))
+ (image-file "../images/textures/bwsortiebg.jpg"))
(sprite
(name "green_tendrils")
- (image (file "../images/textures/green_tendrils.png")))
+ (image-file "../images/textures/green_tendrils.png"))
(sprite
(name "mountain")
- (image (file "../images/textures/mountain.png")))
+ (image-file "../images/textures/mountain.png"))
(sprite
(name "thunderstorm")
- (image (file "../images/textures/thunderstorm.png")))
+ (image-file "../images/textures/thunderstorm.png"))
(sprite
(name "creepers")
- (image (file "../images/textures/creepers.png")))
+ (image-file "../images/textures/creepers.png"))
(sprite
(name "creepers-mirrored")
- (image (file "../images/textures/creepers-mirrored.png")))
+ (image-file "../images/textures/creepers-mirrored.png"))
(sprite
(name "swirljungle")
- (image (file "../images/textures/swirljungle.png")))
+ (image-file "../images/textures/swirljungle.png"))
(sprite
(name "ordina")
- (image (file "../images/textures/ordina.jpg")))
+ (image-file "../images/textures/ordina.jpg"))
(sprite
(name "fond1")
- (image (file "../images/textures/ordina.jpg")))
+ (image-file "../images/textures/ordina.jpg"))
)
)
Modified: branches/pingus_sdl/data/data/traps.res
===================================================================
--- branches/pingus_sdl/data/data/traps.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/traps.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -3,86 +3,86 @@
(section (name "traps")
(sprite
(name "tut")
- (image (file "../images/traps/tut.png")))
+ (image-file "../images/traps/tut.png"))
(sprite
(name "smasher_cmap")
- (image (file "../images/traps/smasher_cmap.png")))
+ (image-file "../images/traps/smasher_cmap.png"))
(sprite
(name "smasher")
- (image (file "../images/traps/smasher.png")
- (array 6 1)
- (size 282 189)
- (pos 0 0)))
+ (image-file "../images/traps/smasher.png")
+ (image-array 6 1)
+ (image-size 282 189)
+ (image-pos 0 0))
(sprite
(name "hammer")
(loop #f)
(speed 60)
- (image (file "../images/traps/hammer.png")
- (array 13 1)
- (size 151 181)
- (pos 0 0)))
+ (image-file "../images/traps/hammer.png")
+ (image-array 13 1)
+ (image-size 151 181)
+ (image-pos 0 0))
(sprite
(name "fake_exit")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/traps/fake_exit.png")
- (array 9 1)
- (size 75 112)
- (pos 0 0)))
+ (image-file "../images/traps/fake_exit.png")
+ (image-array 9 1)
+ (image-size 75 112)
+ (image-pos 0 0))
(sprite
(name "spike")
- (image (file "../images/traps/spike.png")
- (array 14 1)
- (size 32 32)
- (pos 0 0)))
+ (image-file "../images/traps/spike.png")
+ (image-array 14 1)
+ (image-size 32 32)
+ (image-pos 0 0))
(section (name "guillotinekill")
(sprite
(name "left")
- (image (file "../images/traps/guillotinekill.png")
- (array 12 1)
- (size 80 96)
- (pos 0 0)))
+ (image-file "../images/traps/guillotinekill.png")
+ (image-array 12 1)
+ (image-size 80 96)
+ (image-pos 0 0))
(sprite
(name "right")
- (image (file "../images/traps/guillotinekill.png")
- (array 12 1)
- (size 80 96)
- (pos 0 96)))
+ (image-file "../images/traps/guillotinekill.png")
+ (image-array 12 1)
+ (image-size 80 96)
+ (image-pos 0 96))
)
(sprite
(name "guillotineidle")
- (image (file "../images/traps/guillotineidle.png")
- (array 7 1)
- (size 80 96)
- (pos 0 0)))
+ (image-file "../images/traps/guillotineidle.png")
+ (image-array 7 1)
+ (image-size 80 96)
+ (image-pos 0 0))
(sprite
(name "laser_exit")
- (image (file "../images/traps/laser_exit.png")
- (array 6 1)
- (size 75 60)
- (pos 0 0)))
+ (image-file "../images/traps/laser_exit.png")
+ (image-array 6 1)
+ (image-size 75 60)
+ (image-pos 0 0))
(sprite
(name "bumper")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/traps/bumper.png")
- (array 6 1)
- (size 60 102)
- (pos 0 0)))
+ (image-file "../images/traps/bumper.png")
+ (image-array 6 1)
+ (image-size 60 102)
+ (image-pos 0 0))
(sprite
(name "bumper_cmap")
- (image (file "../images/traps/bumper_cmap.png")))
+ (image-file "../images/traps/bumper_cmap.png"))
)
)
Modified: branches/pingus_sdl/data/data/worldmaps.res
===================================================================
--- branches/pingus_sdl/data/data/worldmaps.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/worldmaps.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -4,31 +4,31 @@
(section (name "tutorial")
(sprite
(name "layer0")
- (image (file "../images/worldmaps/tutorial_layer0.jpg")))
+ (image-file "../images/worldmaps/tutorial_layer0.jpg"))
(sprite
(name "layer1")
- (image (file "../images/worldmaps/tutorial_layer1.png")))
+ (image-file "../images/worldmaps/tutorial_layer1.png"))
(sprite
(name "layer2")
- (image (file "../images/worldmaps/tutorial_layer2.png")))
+ (image-file "../images/worldmaps/tutorial_layer2.png"))
(sprite
(name "layer3")
- (image (file "../images/worldmaps/tutorial_layer3.png")))
+ (image-file "../images/worldmaps/tutorial_layer3.png"))
)
(section (name "volcano")
(sprite
(name "island")
- (image (file "../images/worldmaps/volcano.jpg")))
+ (image-file "../images/worldmaps/volcano.jpg"))
)
(section (name "misc")
(sprite
(name "pacman")
- (image (file "../images/worldmaps/pacman.jpg")))
+ (image-file "../images/worldmaps/pacman.jpg"))
)
)
)
Modified: branches/pingus_sdl/data/data/worldobjs.res
===================================================================
--- branches/pingus_sdl/data/data/worldobjs.res 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/data/data/worldobjs.res 2007-01-14 23:59:43 UTC (rev
2652)
@@ -3,31 +3,31 @@
(section (name "worldobjs")
(sprite
(name "switchdoor_box")
- (image (file "../images/worldobjs/switchdoor_box.png")))
+ (image-file "../images/worldobjs/switchdoor_box.png"))
(sprite
(name "switchdoor_tile")
- (image (file "../images/worldobjs/switchdoor_tile.png")))
+ (image-file "../images/worldobjs/switchdoor_tile.png"))
(sprite
(name "switchdoor_switch")
- (image (file "../images/worldobjs/switchdoor_switch.png")))
+ (image-file "../images/worldobjs/switchdoor_switch.png"))
(sprite
(name "switchdoor_tile_cmap")
- (image (file "../images/worldobjs/switchdoor_tile_cmap.png")))
+ (image-file "../images/worldobjs/switchdoor_tile_cmap.png"))
(sprite
(name "teleporter2")
(origin "center")
(offset 0 0)
- (image (file "../images/worldobjs/teleporter2.png")))
+ (image-file "../images/worldobjs/teleporter2.png"))
(sprite
(name "infobox")
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/worldobjs/infobox.png")))
+ (image-file "../images/worldobjs/infobox.png"))
(sprite
(name "teleporter")
@@ -35,10 +35,10 @@
(speed 20)
(origin "bottom_center")
(offset 0 0)
- (image (file "../images/worldobjs/teleporter.png")
- (array 6 1)
- (size 35 52)
- (pos 0 0)))
+ (image-file "../images/worldobjs/teleporter.png")
+ (image-array 6 1)
+ (image-size 35 52)
+ (image-pos 0 0))
(sprite
(name "teleportertarget")
@@ -46,46 +46,46 @@
(speed 15)
(origin "center")
(offset 0 0)
- (image (file "../images/worldobjs/teleportertarget.png")
- (array 7 1)
- (size 64 64)
- (pos 0 0)))
+ (image-file "../images/worldobjs/teleportertarget.png")
+ (image-array 7 1)
+ (image-size 64 64)
+ (image-pos 0 0))
(sprite
(name "conveyorbelt_left")
- (image (file "../images/worldobjs/conveyorbelt_left.png")
- (array 15 1)
- (size 15 14)
- (pos 0 0)))
+ (image-file "../images/worldobjs/conveyorbelt_left.png")
+ (image-array 15 1)
+ (image-size 15 14)
+ (image-pos 0 0))
(sprite
(name "conveyorbelt_middle")
- (image (file "../images/worldobjs/conveyorbelt_middle.png")
- (array 15 1)
- (size 15 14)
- (pos 0 0)))
+ (image-file "../images/worldobjs/conveyorbelt_middle.png")
+ (image-array 15 1)
+ (image-size 15 14)
+ (image-pos 0 0))
(sprite
(name "conveyorbelt_right")
- (image (file "../images/worldobjs/conveyorbelt_right.png")
- (array 15 1)
- (size 15 14)
- (pos 0 0)))
+ (image-file "../images/worldobjs/conveyorbelt_right.png")
+ (image-array 15 1)
+ (image-size 15 14)
+ (image-pos 0 0))
(sprite
(name "iceblock")
- (image (file "../images/worldobjs/iceblock.png")
- (array 6 1)
- (size 25 10)
- (pos 0 0)))
+ (image-file "../images/worldobjs/iceblock.png")
+ (image-array 6 1)
+ (image-size 25 10)
+ (image-pos 0 0))
(sprite
(name "iceblock_cmap")
- (image (file "../images/worldobjs/iceblock_cmap.png")))
+ (image-file "../images/worldobjs/iceblock_cmap.png"))
(sprite
(name "conveyorbelt_cmap")
- (image (file "../images/worldobjs/conveyorbelt_cmap.png")))
+ (image-file "../images/worldobjs/conveyorbelt_cmap.png"))
)
)
Modified: branches/pingus_sdl/src/SConscript
===================================================================
--- branches/pingus_sdl/src/SConscript 2007-01-14 20:34:25 UTC (rev 2651)
+++ branches/pingus_sdl/src/SConscript 2007-01-14 23:59:43 UTC (rev 2652)
@@ -255,6 +255,7 @@
'tinygettext/tinygettext.cxx',
# 'true_server.cxx',
'math/vector2f.cpp',
+'math/vector2i.cpp',
'math/vector3f.cpp',
'physfs/physfs_sdl.cpp',
'physfs/physfs_stream.cpp',
Modified: branches/pingus_sdl/src/file_reader.cxx
===================================================================
--- branches/pingus_sdl/src/file_reader.cxx 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/src/file_reader.cxx 2007-01-14 23:59:43 UTC (rev
2652)
@@ -102,18 +102,25 @@
return false;
}
-#if 0
bool
-FileReader::read_size (const char* name, CL_Size& value) const
+FileReader::read_size (const char* name, Size& value) const
{
if (impl.get())
return impl->read_size(name, value);
else
return false;
}
-#endif
bool
+FileReader::read_vector2i(const char* name, Vector2i& value) const
+{
+ if (impl.get())
+ return impl->read_vector2i(name, value);
+ else
+ return false;
+}
+
+bool
FileReader::read_section(const char* name, FileReader& reader) const
{
if (impl.get())
Modified: branches/pingus_sdl/src/file_reader.hxx
===================================================================
--- branches/pingus_sdl/src/file_reader.hxx 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/src/file_reader.hxx 2007-01-14 23:59:43 UTC (rev
2652)
@@ -27,6 +27,7 @@
class Size;
class Color;
class Vector3f;
+class Vector2i;
class ResDescriptor;
class FileReaderImpl;
@@ -48,6 +49,8 @@
bool read_bool (const char* name, bool&) const;
bool read_string(const char* name, std::string&) const;
bool read_vector(const char* name, Vector3f&) const;
+ bool read_vector2i(const char* name, Vector2i&) const;
+ bool read_size (const char* name, Size&) const;
bool read_color (const char* name, Color&) const;
//// bool read_size (const char* name, CL_Size&) const;
bool read_desc (const char* name, ResDescriptor&) const;
Modified: branches/pingus_sdl/src/file_reader_impl.hxx
===================================================================
--- branches/pingus_sdl/src/file_reader_impl.hxx 2007-01-14 20:34:25 UTC
(rev 2651)
+++ branches/pingus_sdl/src/file_reader_impl.hxx 2007-01-14 23:59:43 UTC
(rev 2652)
@@ -26,8 +26,8 @@
class Size;
class Color;
class Vector3f;
+class Vector2i;
-
class FileReader;
class ResDescriptor;
@@ -44,7 +44,9 @@
virtual bool read_bool (const char* name, bool&) const =0;
virtual bool read_string(const char* name, std::string&) const =0;
virtual bool read_vector(const char* name, Vector3f&) const =0;
- virtual bool read_color (const char* name, Color&) const =0;
+ virtual bool read_size (const char* name, Size&) const =0;
+ virtual bool read_vector2i(const char* name, Vector2i&) const =0;
+ virtual bool read_color (const char* name, Color&) const =0;
virtual bool read_desc (const char* name, ResDescriptor&) const =0;
//// virtual bool read_size (const char* name, CL_Size&) const =0;
virtual bool read_section(const char* name, FileReader&) const =0;
Modified: branches/pingus_sdl/src/math/vector2i.cpp
===================================================================
--- branches/pingus_sdl/src/math/vector2i.cpp 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/src/math/vector2i.cpp 2007-01-14 23:59:43 UTC (rev
2652)
@@ -28,7 +28,7 @@
Vector2i
Vector2i::operator+ (const Vector2i& add) const
{
- return Vector2i(x + sub.x, y + sub.y);
+ return Vector2i(x + add.x, y + add.y);
}
Vector2i
@@ -46,8 +46,9 @@
Vector2i&
Vector2i::operator+= (const Vector2i& add)
{
- x += sub.x;
- y += sub.y;
+ x += add.x;
+ y += add.y;
+ return *this;
}
Vector2i&
@@ -55,6 +56,7 @@
{
x -= sub.x;
y -= sub.y;
+ return *this;
}
Vector2i&
@@ -62,6 +64,7 @@
{
x *= mul;
y *= mul;
+ return *this;
}
/* EOF */
Modified: branches/pingus_sdl/src/origin.cpp
===================================================================
--- branches/pingus_sdl/src/origin.cpp 2007-01-14 20:34:25 UTC (rev 2651)
+++ branches/pingus_sdl/src/origin.cpp 2007-01-14 23:59:43 UTC (rev 2652)
@@ -29,42 +29,66 @@
#include "origin.hpp"
-#if 0
-Point calc_origin(Origin origin, const CL_Size &size)
+Origin string2origin(const std::string& str)
{
- switch(origin)
- {
- case origin_top_left:
- default:
- return CL_Point(0, 0);
- break;
- case origin_top_center:
- return CL_Point(size.width / 2, 0);
- break;
- case origin_top_right:
- return CL_Point(size.width, 0);
- break;
- case origin_center_left:
- return CL_Point(0, size.height / 2);
- break;
- case origin_center:
- return CL_Point(size.width / 2, size.height / 2);
- break;
- case origin_center_right:
- return CL_Point(size.width, size.height / 2);
- break;
- case origin_bottom_left:
- return CL_Point(0, size.height);
- break;
- case origin_bottom_center:
- return CL_Point(size.width / 2, size.height);
- break;
- case origin_bottom_right:
- return CL_Point(size.width, size.height);
- break;
- }
+ if (str == "top_left")
+ return origin_top_left;
+ else if (str == "top_center")
+ return origin_top_center;
+ else if (str == "top_right")
+ return origin_top_right;
+ else if (str == "center_left")
+ return origin_center_left;
+ else if (str == "center")
+ return origin_center;
+ else if (str == "center_right")
+ return origin_center_right;
+ else if (str == "bottom_left")
+ return origin_bottom_left;
+ else if (str == "bottom_center")
+ return origin_bottom_center;
+ else if (str == "bottom_right")
+ return origin_bottom_right;
+ else
+ return origin_top_left;
}
+Vector2i calc_origin(Origin origin, const Size &size)
+{
+ switch(origin)
+ {
+ case origin_top_left:
+ default:
+ return Vector2i(0, 0);
+ break;
+ case origin_top_center:
+ return Vector2i(size.width / 2, 0);
+ break;
+ case origin_top_right:
+ return Vector2i(size.width, 0);
+ break;
+ case origin_center_left:
+ return Vector2i(0, size.height / 2);
+ break;
+ case origin_center:
+ return Vector2i(size.width / 2, size.height / 2);
+ break;
+ case origin_center_right:
+ return Vector2i(size.width, size.height / 2);
+ break;
+ case origin_bottom_left:
+ return Vector2i(0, size.height);
+ break;
+ case origin_bottom_center:
+ return Vector2i(size.width / 2, size.height);
+ break;
+ case origin_bottom_right:
+ return Vector2i(size.width, size.height);
+ break;
+ }
+}
+
+#if 0
CL_Pointf calc_origin(CL_Origin origin, const CL_Sizef &size)
{
switch(origin)
Modified: branches/pingus_sdl/src/origin.hpp
===================================================================
--- branches/pingus_sdl/src/origin.hpp 2007-01-14 20:34:25 UTC (rev 2651)
+++ branches/pingus_sdl/src/origin.hpp 2007-01-14 23:59:43 UTC (rev 2652)
@@ -37,6 +37,10 @@
#pragma once
#endif
+#include <string>
+#include "math/vector2i.hpp"
+#include "math/size.hpp"
+
//: Alignment origins.
//- !group=Core/Math!
//- !header=core.h!
@@ -53,11 +57,14 @@
origin_bottom_right
};
+Origin string2origin(const std::string& str);
+
+Vector2i calc_origin(Origin origin, const Size& size);
+
#if 0
//: Returns the anchor point for the origin within the dimensions of the size
structure.
//- !group=Display/Display 2D!
//- !header=display.h!
-CL_API_CORE CL_Point calc_origin(CL_Origin origin, const CL_Size &size);
CL_API_CORE CL_Pointf calc_origin(CL_Origin origin, const CL_Sizef &size);
CL_API_CORE CL_Pointd calc_origin(CL_Origin origin, const CL_Sized &size);
#endif
Modified: branches/pingus_sdl/src/resource.cxx
===================================================================
--- branches/pingus_sdl/src/resource.cxx 2007-01-14 20:34:25 UTC (rev
2651)
+++ branches/pingus_sdl/src/resource.cxx 2007-01-14 23:59:43 UTC (rev
2652)
@@ -115,7 +115,11 @@
Sprite
Resource::load_sprite(const std::string& res_name)
{
- return Sprite(res_name);
+ SpriteDescription* desc = resmgr.get_sprite_description(res_name);
+ if (desc)
+ return Sprite(*desc);
+ else
+ return Sprite();
#if 0
try {
Modified: branches/pingus_sdl/src/resource_manager.cpp
===================================================================
--- branches/pingus_sdl/src/resource_manager.cpp 2007-01-14 20:34:25 UTC
(rev 2651)
+++ branches/pingus_sdl/src/resource_manager.cpp 2007-01-14 23:59:43 UTC
(rev 2652)
@@ -26,6 +26,7 @@
#include <iostream>
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
+#include "sprite_description.hpp"
#include "sexpr_file_reader.hpp"
#include "resource_manager.hpp"
@@ -51,7 +52,7 @@
std::vector<FileReader> sections = reader.get_sections();
for(std::vector<FileReader>::iterator i = sections.begin(); i !=
sections.end(); ++i)
{
- std::cout << "Section: " << i->get_name() << std::endl;
+ //std::cout << "Section: " << i->get_name() << std::endl;
parse("", *i);
}
}
@@ -79,11 +80,18 @@
{
std::string name;
reader.read_string("name", name);
- std::cout << "sprite: " << section << "/" << name << std::endl;
+ if (!section.empty())
+ name = section + "/" + name;
+
+ resources[name] = new SpriteDescription(reader);
}
else if (reader.get_name() == "alias")
{
-
+ std::string name;
+ std::string link;
+ reader.read_string("name", name);
+ reader.read_string("link", link);
+ std::cout << "alias: " << name << " -> " << link << std::endl;
}
else if (reader.get_name() == "name")
{
@@ -111,4 +119,18 @@
}
}
+SpriteDescription*
+ResourceManager::get_sprite_description(const std::string& name) const
+{
+ Resources::const_iterator i = resources.find(name);
+ if (i != resources.end())
+ {
+ return i->second;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
/* EOF */
Modified: branches/pingus_sdl/src/resource_manager.hpp
===================================================================
--- branches/pingus_sdl/src/resource_manager.hpp 2007-01-14 20:34:25 UTC
(rev 2651)
+++ branches/pingus_sdl/src/resource_manager.hpp 2007-01-14 23:59:43 UTC
(rev 2652)
@@ -27,20 +27,24 @@
#define HEADER_RESOURCE_MANAGER_HPP
#include <string>
+#include <map>
+class SpriteDescription;
class FileReader;
/** */
class ResourceManager
{
private:
+ typedef std::map<std::string, SpriteDescription*> Resources;
+ Resources resources;
-
public:
ResourceManager();
~ResourceManager();
void add_resources(const std::string& filename);
+ SpriteDescription* get_sprite_description(const std::string& name) const;
private:
void parse(const std::string& section, FileReader&);
void parse_section(const std::string& section, FileReader&);
Modified: branches/pingus_sdl/src/sexpr_file_reader.cpp
===================================================================
--- branches/pingus_sdl/src/sexpr_file_reader.cpp 2007-01-14 20:34:25 UTC
(rev 2651)
+++ branches/pingus_sdl/src/sexpr_file_reader.cpp 2007-01-14 23:59:43 UTC
(rev 2652)
@@ -27,6 +27,7 @@
#include "math/vector3f.hpp"
#include "math/color.hpp"
#include "math/size.hpp"
+#include "math/vector2i.hpp"
#include "file_reader_impl.hxx"
#include "sexpr_file_reader.hpp"
@@ -122,6 +123,30 @@
return false;
}
+ bool read_size(const char* name, Size& v) const
+ {
+ lisp::Lisp* sub = get_subsection_item(name);
+ if (sub && sub->get_list_size() == 3)
+ {
+ v.width = sub->get_list_elem(1)->get_int();
+ v.height = sub->get_list_elem(2)->get_int();
+ return true;
+ }
+ return false;
+ }
+
+ bool read_vector2i(const char* name, Vector2i& v) const
+ {
+ lisp::Lisp* sub = get_subsection_item(name);
+ if (sub && sub->get_list_size() == 3)
+ {
+ v.x = sub->get_list_elem(1)->get_int();
+ v.y = sub->get_list_elem(2)->get_int();
+ return true;
+ }
+ return false;
+ }
+
bool read_color (const char* name, Color& v) const
{
lisp::Lisp* sub = get_subsection_item(name);
@@ -141,18 +166,6 @@
return false;
}
- bool read_size (const char* name, Size& v) const
- {
- lisp::Lisp* sub = get_subsection_item(name);
- if (sub && sub->get_list_size() == 3)
- {
- v = Size(int(sub->get_list_elem(1)->get_int()),
- int(sub->get_list_elem(2)->get_int()));
- return true;
- }
- return false;
- }
-
bool read_section(const char* name, FileReader& v) const
{
lisp::Lisp* cur = get_subsection(name);
Modified: branches/pingus_sdl/src/sprite.cpp
===================================================================
--- branches/pingus_sdl/src/sprite.cpp 2007-01-14 20:34:25 UTC (rev 2651)
+++ branches/pingus_sdl/src/sprite.cpp 2007-01-14 23:59:43 UTC (rev 2652)
@@ -31,6 +31,7 @@
#include "math/vector2i.hpp"
#include "SDL_image.h"
#include "sprite.hpp"
+#include "sprite_description.hpp"
class SpriteImpl
{
@@ -39,6 +40,27 @@
Vector2i offset;
Origin origin;
+ SpriteImpl(const SpriteDescription& desc)
+ {
+ surface = IMG_Load(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");
+ assert(surface);
+ }
+ else
+ {
+ std::cout << "Loaded sprite: " << desc.filename << std::endl;
+ }
+
+
+ origin = desc.origin;
+ offset = calc_origin(origin, Size(surface->w, surface->h)) + desc.offset;
+
+ std::cout << "offset: " << offset.x << ", " << offset.y << std::endl;
+ }
+
SpriteImpl(const std::string& name)
{
std::ostringstream str;
@@ -69,7 +91,7 @@
SDL_Rect pos;
pos.x = (Sint16)(x - offset.x);
- pos.y = (Sint16)(y - offset.y);
+ pos.y = (Sint16)(y + offset.y);
pos.w = 0;
pos.h = 0;
@@ -87,6 +109,11 @@
{
}
+Sprite::Sprite(const SpriteDescription& desc)
+ : impl(new SpriteImpl(desc))
+{
+}
+
Sprite::~Sprite()
{
}
Modified: branches/pingus_sdl/src/sprite.hpp
===================================================================
--- branches/pingus_sdl/src/sprite.hpp 2007-01-14 20:34:25 UTC (rev 2651)
+++ branches/pingus_sdl/src/sprite.hpp 2007-01-14 23:59:43 UTC (rev 2652)
@@ -31,12 +31,14 @@
#include "shared_ptr.hxx"
class SpriteImpl;
+class SpriteDescription;
/** */
class Sprite
{
public:
Sprite();
+ Sprite(const SpriteDescription& desc);
Sprite(const std::string& name);
~Sprite();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2652 - in branches/pingus_sdl: . data/data src src/math,
grumbel at BerliOS <=