[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] rev 2313 - in trunk: data/data src src/gui src/particles sr
|
From: |
Ingo Ruhnke |
|
Subject: |
[Pingus-CVS] rev 2313 - in trunk: data/data src src/gui src/particles src/worldobjs |
|
Date: |
Fri, 07 May 2004 17:57:10 +0200 |
Author: grumbel
Date: 2004-05-07 17:57:09 +0200 (Fri, 07 May 2004)
New Revision: 2313
Modified:
trunk/data/data/core.xml
trunk/data/data/game.xml
trunk/data/data/liquids.xml
trunk/src/action_button.cxx
trunk/src/action_button.hxx
trunk/src/game_counter.cxx
trunk/src/gui/display_graphic_context.cxx
trunk/src/particles/explosive_particle.cxx
trunk/src/particles/ground_particle.cxx
trunk/src/particles/pingu_particle_holder.cxx
trunk/src/particles/pingu_particle_holder.hxx
trunk/src/particles/smoke_particle_holder.cxx
trunk/src/particles/smoke_particle_holder.hxx
trunk/src/particles/snow_particle_holder.cxx
trunk/src/particles/snow_particle_holder.hxx
trunk/src/result_screen.cxx
trunk/src/smallmap.cxx
trunk/src/smallmap.hxx
trunk/src/spot_map.cxx
trunk/src/spot_map.hxx
trunk/src/time_display.cxx
trunk/src/time_display.hxx
trunk/src/worldobjs/liquid.cxx
trunk/src/worldobjs/liquid.hxx
trunk/src/worldobjs/surface_background.cxx
Log:
- fixed liquid datafile
- some other stuff
- loading normal levels works, but still full of graphic bugs
Modified: trunk/data/data/core.xml
===================================================================
--- trunk/data/data/core.xml 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/data/data/core.xml 2004-05-07 15:57:09 UTC (rev 2313)
@@ -1,277 +1,395 @@
<resources>
<section name="cursors">
- <surface file="../images/core/cursors/editor.png" height="38"
name="editor" tcol="0" translate-x="19" translate-y="19" width="38" x="0" y="0"
/>
- <surface file="../images/core/cursors/cursor.png" height="16"
name="cursor" tcol="0" width="16" x="0" y="0" />
- <surface file="../images/core/cursors/scroll.png" height="32"
name="scroll_cur" tcol="0" width="32" x="0" y="0" />
- <surface file="../images/core/cursors/cap.png" height="40" name="capgood"
width="40" x="0" y="0" />
- <surface file="../images/core/cursors/capwrong.png" height="40"
name="capbad" width="40" x="0" y="0" />
- <surface file="../images/core/cursors/cross.png" height="36" name="cross"
width="36" x="0" y="0" />
- <surface array="10x1" file="../images/core/cursors/animcross.png"
height="36" name="animcross" />
- <surface file="../images/core/cursors/arrow_right.png" height="9"
name="arrow_right" />
- <surface file="../images/core/cursors/arrow_left.png" height="9"
name="arrow_left" />
+ <sprite name="editor">
+ <image file="../images/core/cursors/editor.png"/>
+ </sprite>
+ <sprite name="cursor">
+ <image file="../images/core/cursors/cursor.png"/>
+ </sprite>
+ <sprite name="scroll_cur">
+ <image file="../images/core/cursors/scroll.png"/>
+ </sprite>
+ <sprite name="capgood">
+ <image file="../images/core/cursors/cap.png"/>
+ </sprite>
+ <sprite name="capbad">
+ <image file="../images/core/cursors/capwrong.png"/>
+ </sprite>
+ <sprite name="cross">
+ <image file="../images/core/cursors/cross.png"/>
+ </sprite>
+ <sprite name="arrow_right">
+ <image file="../images/core/cursors/arrow_right.png"/>
+ </sprite>
+ <sprite name="arrow_left">
+ <image file="../images/core/cursors/arrow_left.png"/>
+ </sprite>
+ <sprite name="animcross">
+ <image file="../images/core/cursors/animcross.png">
+ <grid array="10x1"/>
+ </image>
+ </sprite>
</section>
<section name="editor">
- <surface file="../images/core/editor/start_pos.png" height="59"
name="start_pos" />
- <surface file="../images/core/editor/weather_rain.png" height="101"
name="weather_rain" />
- <surface file="../images/core/editor/weather_snow.png" height="64"
name="weather_snow" />
- <surface file="../images/core/editor/tb_copy.png" height="24" name="copy"
/>
- <surface file="../images/core/editor/tb_new.png" height="24" name="new" />
- <surface file="../images/core/editor/tb_open.png" height="24" name="open"
/>
- <surface file="../images/core/editor/tb_save.png" height="24" name="save"
/>
- <surface file="../images/core/editor/tb_exit.png" height="24" name="exit"
tcol="0" width="24" x="0" y="0" />
- <surface file="../images/core/editor/tb_clock_run.png" height="24"
name="clock_run" tcol="0" width="24" x="0" y="0" />
- <surface file="../images/core/editor/tb_edit.png" height="24" name="edit"
tcol="0" width="24" x="0" y="0" />
- <surface file="../images/core/editor/tb_preferences.png" height="24"
name="preferences" tcol="0" width="24" x="0" y="0" />
- <surface file="../images/core/editor/tb_help.png" height="24" name="help"
tcol="0" width="24" x="0" y="0" />
- <surface file="../images/core/editor/tb_trash.png" height="24"
name="delete" tcol="0" width="24" x="0" y="0" />
- <surface file="../images/core/editor/tb_index.png" height="24"
name="index" tcol="0" width="24" x="0" y="0" />
- <surface file="../images/core/editor/region-zoom.png" height="24"
name="region-zoom" width="24" x="0" y="0" />
- <surface file="../images/core/editor/zoom-in.png" height="24"
name="zoom-in" width="24" x="0" y="0" />
- <surface file="../images/core/editor/zoom-out.png" height="24"
name="zoom-out" width="24" x="0" y="0" />
- <surface file="../images/core/editor/button.png" height="24" name="button"
width="24" x="0" y="0" />
- <surface file="../images/core/editor/button_pressed.png" height="24"
name="button_pressed" width="24" x="0" y="0" />
- <surface file="../images/core/editor/actions.png" name="actions" />
- <surface file="../images/core/editor/logo.png" name="logo" />
+ <sprite name="start_pos">
+ <image file="../images/core/editor/start_pos.png"/>
+ </sprite>
+ <sprite name="weather_rain">
+ <image file="../images/core/editor/weather_rain.png"/>
+ </sprite>
+ <sprite name="weather_snow">
+ <image file="../images/core/editor/weather_snow.png"/>
+ </sprite>
+ <sprite name="copy">
+ <image file="../images/core/editor/tb_copy.png"/>
+ </sprite>
+ <sprite name="new">
+ <image file="../images/core/editor/tb_new.png"/>
+ </sprite>
+ <sprite name="open">
+ <image file="../images/core/editor/tb_open.png"/>
+ </sprite>
+ <sprite name="save">
+ <image file="../images/core/editor/tb_save.png"/>
+ </sprite>
+ <sprite name="exit">
+ <image file="../images/core/editor/tb_exit.png"/>
+ </sprite>
+ <sprite name="clock_run">
+ <image file="../images/core/editor/tb_clock_run.png"/>
+ </sprite>
+ <sprite name="edit">
+ <image file="../images/core/editor/tb_edit.png"/>
+ </sprite>
+ <sprite name="preferences">
+ <image file="../images/core/editor/tb_preferences.png"/>
+ </sprite>
+ <sprite name="help">
+ <image file="../images/core/editor/tb_help.png"/>
+ </sprite>
+ <sprite name="delete">
+ <image file="../images/core/editor/tb_trash.png"/>
+ </sprite>
+ <sprite name="index">
+ <image file="../images/core/editor/tb_index.png"/>
+ </sprite>
+ <sprite name="region-zoom">
+ <image file="../images/core/editor/region-zoom.png"/>
+ </sprite>
+ <sprite name="zoom-in">
+ <image file="../images/core/editor/zoom-in.png"/>
+ </sprite>
+ <sprite name="zoom-out">
+ <image file="../images/core/editor/zoom-out.png"/>
+ </sprite>
+ <sprite name="button">
+ <image file="../images/core/editor/button.png"/>
+ </sprite>
+ <sprite name="button_pressed">
+ <image file="../images/core/editor/button_pressed.png"/>
+ </sprite>
+ <sprite name="actions">
+ <image file="../images/core/editor/actions.png"/>
+ </sprite>
+ <sprite name="logo">
+ <image file="../images/core/editor/logo.png"/>
+ </sprite>
</section>
<section name="buttons">
<sprite name="info">
- <translation origin="top_center" />
- <image file="../images/core/buttons/info.png" />
+ <translation origin="top_center"/>
+ <image file="../images/core/buttons/info.png"/>
</sprite>
- <surface file="../images/core/buttons/hbuttonbg.png" name="hbuttonbg" />
- <surface file="../images/core/buttons/hbuttonbgb.png" name="hbuttonbgb" />
- <surface file="../images/core/buttons/buttonbackground.png"
name="buttonbackground" />
- <surface file="../images/core/buttons/buttonbackgroundhl.png"
name="buttonbackgroundhl" />
- <surface file="../images/core/buttons/back.png" height="34" name="back"
tcol="0" width="64" x="0" y="0" />
- <surface file="../images/core/buttons/pause.png" height="56" name="pause"
width="38" x="0" y="0" />
- <surface file="../images/core/buttons/fast_forward.png" height="56"
name="fast_forward" width="38" x="0" y="0" />
- <surface array="14x1" file="../images/core/buttons/armageddon_anim.png"
height="57" name="armageddon_anim" width="36" x="0" y="0" />
+ <sprite name="hbuttonbg">
+ <image file="../images/core/buttons/hbuttonbg.png"/>
+ </sprite>
+ <sprite name="hbuttonbgb">
+ <image file="../images/core/buttons/hbuttonbgb.png"/>
+ </sprite>
+ <sprite name="buttonbackground">
+ <image file="../images/core/buttons/buttonbackground.png"/>
+ </sprite>
+ <sprite name="buttonbackgroundhl">
+ <image file="../images/core/buttons/buttonbackgroundhl.png"/>
+ </sprite>
+ <sprite name="back">
+ <image file="../images/core/buttons/back.png"/>
+ </sprite>
+ <sprite name="pause">
+ <image file="../images/core/buttons/pause.png"/>
+ </sprite>
+ <sprite name="fast_forward">
+ <image file="../images/core/buttons/fast_forward.png"/>
+ </sprite>
+
+ <sprite name="armageddon_anim">
+ <image file="../images/core/buttons/armageddon_anim.png"/>
+ <grid array="14,1" size="36,57" pos="0,0"/>
+ </sprite>
</section>
<section name="menu">
<sprite name="background">
- <image file="../images/core/menu/background.jpg" />
+ <image file="../images/core/menu/background.jpg"/>
</sprite>
<sprite name="startscreenbg">
- <image file="../images/core/menu/startscreenbg.jpg" />
+ <image file="../images/core/menu/startscreenbg.jpg"/>
</sprite>
<sprite name="create_on">
- <image file="../images/core/menu/create_on.png" />
+ <image file="../images/core/menu/create_on.png"/>
</sprite>
<sprite name="credits_on">
- <image file="../images/core/menu/credits_on.png" />
+ <image file="../images/core/menu/credits_on.png"/>
</sprite>
<sprite name="exit_on">
- <image file="../images/core/menu/exit_on.png" />
+ <image file="../images/core/menu/exit_on.png"/>
</sprite>
<sprite name="ice_off">
- <image file="../images/core/menu/ice_off.png" />
+ <image file="../images/core/menu/ice_off.png"/>
</sprite>
<sprite name="options_on">
- <image file="../images/core/menu/options_on.png" />
+ <image file="../images/core/menu/options_on.png"/>
</sprite>
<sprite name="play_on">
- <image file="../images/core/menu/play_on.png" />
+ <image file="../images/core/menu/play_on.png"/>
</sprite>
<sprite name="multi_on">
- <image file="../images/core/menu/multi_on.png" />
+ <image file="../images/core/menu/multi_on.png"/>
</sprite>
<sprite name="layer1">
- <image file="../images/core/menu/layer1.jpg" />
+ <image file="../images/core/menu/layer1.jpg"/>
</sprite>
<sprite name="layer2">
- <image file="../images/core/menu/layer2.png" />
+ <image file="../images/core/menu/layer2.png"/>
</sprite>
<sprite name="layer3">
- <image file="../images/core/menu/layer3.png" />
+ <image file="../images/core/menu/layer3.png"/>
</sprite>
<sprite name="layer4">
- <image file="../images/core/menu/layer4.png" />
+ <image file="../images/core/menu/layer4.png"/>
</sprite>
<sprite name="layer5">
- <image file="../images/core/menu/layer5.png" />
+ <image file="../images/core/menu/layer5.png"/>
</sprite>
<sprite name="enterlevel">
- <image file="../images/core/menu/enterlevel.png" />
+ <image file="../images/core/menu/enterlevel.png"/>
</sprite>
<sprite name="enterlevel">
- <image file="../images/core/menu/enterlevel.png" />
+ <image file="../images/core/menu/enterlevel.png"/>
</sprite>
<sprite name="enterlevel">
- <image file="../images/core/menu/enterlevel.png" />
+ <image file="../images/core/menu/enterlevel.png"/>
</sprite>
<sprite name="close_highlight">
- <image file="../images/core/menu/close_highlight.png" />
+ <image file="../images/core/menu/close_highlight.png"/>
</sprite>
<sprite name="close_normal">
- <image file="../images/core/menu/close_normal.png" />
+ <image file="../images/core/menu/close_normal.png"/>
</sprite>
<sprite name="close_pressed">
- <image file="../images/core/menu/close_pressed.png" />
+ <image file="../images/core/menu/close_pressed.png"/>
</sprite>
<sprite name="exit_button_normal">
- <image file="../images/core/menu/exit_button_normal.png" />
+ <image file="../images/core/menu/exit_button_normal.png"/>
</sprite>
<sprite name="exit_button_hover">
- <image file="../images/core/menu/exit_button_hover.png" />
+ <image file="../images/core/menu/exit_button_hover.png"/>
</sprite>
<sprite name="exit_button_pressed">
- <image file="../images/core/menu/exit_button_pressed.png" />
+ <image file="../images/core/menu/exit_button_pressed.png"/>
</sprite>
<sprite name="exit_menu">
- <image file="../images/core/menu/exit_menu.png" />
+ <image file="../images/core/menu/exit_menu.png"/>
</sprite>
</section>
<section name="result">
<sprite name="retry">
- <image file="../images/core/menu/result_retry.png" />
+ <image file="../images/core/menu/result_retry.png"/>
</sprite>
<sprite name="ok">
- <image file="../images/core/menu/result_ok.png" />
+ <image file="../images/core/menu/result_ok.png"/>
</sprite>
</section>
<section name="start">
<sprite name="ok">
- <image file="../images/core/misc/start_ok.png" />
+ <image file="../images/core/misc/start_ok.png"/>
</sprite>
<sprite name="ok_hover">
- <image file="../images/core/misc/start_ok_hover.png" />
+ <image file="../images/core/misc/start_ok_hover.png"/>
</sprite>
<sprite name="ok_clicked">
- <image file="../images/core/misc/start_ok_clicked.png" />
+ <image file="../images/core/misc/start_ok_clicked.png"/>
</sprite>
<sprite name="back">
- <image file="../images/core/misc/start_back.png" />
+ <image file="../images/core/misc/start_back.png"/>
</sprite>
<sprite name="back_hover">
- <image file="../images/core/misc/start_back_hover.png" />
+ <image file="../images/core/misc/start_back_hover.png"/>
</sprite>
<sprite name="back_clicked">
- <image file="../images/core/misc/start_back_clicked.png" />
+ <image file="../images/core/misc/start_back_clicked.png"/>
</sprite>
</section>
<section name="misc">
- <surface file="../images/core/misc/next.png" name="next" />
- <surface file="../images/core/misc/next_hover.png" name="next_hover" />
- <surface file="../images/core/misc/chalk_pingu1.png" name="chalk_pingu1" />
- <surface file="../images/core/misc/chalk_pingu2.png" name="chalk_pingu2" />
- <surface file="../images/core/misc/chalk_pingu3.png" name="chalk_pingu3" />
- <surface file="../images/core/misc/chalk_pingu4.png" name="chalk_pingu4" />
- <surface file="../images/core/misc/flag0.png" height="38" name="flag0"
width="27" x="0" y="0" />
- <surface file="../images/core/misc/404.png" height="64" name="404"
width="64" x="0" y="0" />
+ <sprite name="next">
+ <image file="../images/core/misc/next.png"/>
+ </sprite>
+ <sprite name="next_hover">
+ <image file="../images/core/misc/next_hover.png"/>
+ </sprite>
+ <sprite name="chalk_pingu1">
+ <image file="../images/core/misc/chalk_pingu1.png"/>
+ </sprite>
+ <sprite name="chalk_pingu2">
+ <image file="../images/core/misc/chalk_pingu2.png"/>
+ </sprite>
+ <sprite name="chalk_pingu3">
+ <image file="../images/core/misc/chalk_pingu3.png"/>
+ </sprite>
+ <sprite name="chalk_pingu4">
+ <image file="../images/core/misc/chalk_pingu4.png"/>
+ </sprite>
+ <sprite name="flag0">
+ <image file="../images/core/misc/flag0.png"/>
+ </sprite>
+ <surface name="404" file="../images/core/misc/404.png"/>
<sprite name="404sprite">
- <image file="../images/core/misc/404.png" />
+ <image file="../images/core/misc/404.png"/>
</sprite>
- <surface file="../images/core/menu/exitmenu.png" height="296"
name="exitmenu" width="400" x="0" y="0" />
- <surface file="../images/core/misc/logo.png" name="logo" />
- <surface file="../images/core/misc/loading.png" height="66" name="loading"
tcol="0" width="175" x="0" y="0" />
- <surface file="../images/core/misc/pingubw.png" height="400"
name="pingubw" width="307" x="0" y="0" />
- <surface file="../images/core/misc/creditpingu.png" name="creditpingu" />
- <surface file="../images/core/misc/smallmap_entrance.png" height="6"
name="smallmap_entrance" tcol="0" width="6" x="0" y="0" />
- <surface file="../images/core/misc/smallmap_exit.png" height="6"
name="smallmap_exit" tcol="0" width="6" x="0" y="0" />
- <surface file="../images/core/misc/flag0.png" height="38" name="flag0"
width="27" x="0" y="0" />
- <surface file="../images/core/misc/flag1.png" height="38" name="flag1"
width="27" x="0" y="0" />
- <surface file="../images/core/misc/flag2.png" height="38" name="flag2"
width="27" x="0" y="0" />
- <surface file="../images/core/misc/flag3.png" height="38" name="flag3"
width="27" x="0" y="0" />
- <surface file="../images/core/misc/unplayable.png" name="unplayable" />
- <surface file="../images/core/misc/unplayable2.png" name="unplayable2" />
- <surface file="../images/core/misc/infinity.png" name="infinity" />
+ <sprite name="exitmenu">
+ <image file="../images/core/menu/exitmenu.png"/>
+ </sprite>
+ <sprite name="logo">
+ <image file="../images/core/misc/logo.png"/>
+ </sprite>
+ <sprite name="loading">
+ <image file="../images/core/misc/loading.png"/>
+ </sprite>
+ <sprite name="pingubw">
+ <image file="../images/core/misc/pingubw.png"/>
+ </sprite>
+ <sprite name="creditpingu">
+ <image file="../images/core/misc/creditpingu.png"/>
+ </sprite>
+ <sprite name="smallmap_entrance">
+ <image file="../images/core/misc/smallmap_entrance.png"/>
+ </sprite>
+ <sprite name="smallmap_exit">
+ <image file="../images/core/misc/smallmap_exit.png"/>
+ </sprite>
+ <sprite name="flag0">
+ <image file="../images/core/misc/flag0.png"/>
+ </sprite>
+ <sprite name="flag1">
+ <image file="../images/core/misc/flag1.png"/>
+ </sprite>
+ <sprite name="flag2">
+ <image file="../images/core/misc/flag2.png"/>
+ </sprite>
+ <sprite name="flag3">
+ <image file="../images/core/misc/flag3.png"/>
+ </sprite>
+ <sprite name="unplayable">
+ <image file="../images/core/misc/unplayable.png"/>
+ </sprite>
+ <sprite name="unplayable2">
+ <image file="../images/core/misc/unplayable2.png"/>
+ </sprite>
+ <sprite name="infinity">
+ <image file="../images/core/misc/infinity.png"/>
+ </sprite>
</section>
<section name="worldmap">
<sprite name="pingus">
- <translation origin="bottom_center" x="0" y="2" />
+ <translation origin="bottom_center" x="0" y="2"/>
<image file="../images/core/worldmap/pingus.png">
- <grid
- pos="0,0"
- size="24,24"
- array="8,2"
- />
+ <grid pos="0,0" size="24,24" array="8,2"/>
</image>
</sprite>
<sprite name="tube">
- <image file="../images/core/worldmap/tube.png" />
+ <image file="../images/core/worldmap/tube.png"/>
</sprite>
<sprite name="dot_invalid">
- <translation origin="center" />
- <image file="../images/core/worldmap/dot_invalid.png" />
+ <translation origin="center"/>
+ <image file="../images/core/worldmap/dot_invalid.png"/>
</sprite>
<sprite name="dot_green">
- <translation origin="center" />
- <image file="../images/core/worldmap/dot_green.png" />
+ <translation origin="center"/>
+ <image file="../images/core/worldmap/dot_green.png"/>
</sprite>
<sprite name="dot_red">
- <translation origin="center" />
- <image file="../images/core/worldmap/dot_red.png" />
+ <translation origin="center"/>
+ <image file="../images/core/worldmap/dot_red.png"/>
</sprite>
<sprite name="dot_green_hl">
- <translation origin="center" />
- <image file="../images/core/worldmap/dot_green_hl.png" />
+ <translation origin="center"/>
+ <image file="../images/core/worldmap/dot_green_hl.png"/>
</sprite>
<sprite name="dot_red_hl">
- <translation origin="center" />
- <image file="../images/core/worldmap/dot_red_hl.png" />
+ <translation origin="center"/>
+ <image file="../images/core/worldmap/dot_red_hl.png"/>
</sprite>
<sprite name="dot_border">
- <translation origin="center" />
- <image file="../images/core/worldmap/dot_border.png" />
+ <translation origin="center"/>
+ <image file="../images/core/worldmap/dot_border.png"/>
</sprite>
<sprite name="flaggreen">
- <translation origin="center" />
- <image file="../images/core/worldmap/flaggreen.png" />
+ <translation origin="center"/>
+ <image file="../images/core/worldmap/flaggreen.png"/>
</sprite>
<sprite name="arrow">
- <translation origin="bottom_center" />
- <image file="../images/core/worldmap/arrow.png" />
+ <translation origin="bottom_center"/>
+ <image file="../images/core/worldmap/arrow.png"/>
</sprite>
<sprite name="pingus_standing">
- <translation origin="bottom_center" />
+ <translation origin="bottom_center"/>
<image file="../images/core/worldmap/pingus_standing.png">
</image>
</sprite>
<sprite name="levelname_bg">
- <image file="../images/core/worldmap/levelname_bg.png" />
+ <image file="../images/core/worldmap/levelname_bg.png"/>
</sprite>
<sprite name="enter_button_normal">
- <image file="../images/core/worldmap/enter_button_normal.png" />
+ <image file="../images/core/worldmap/enter_button_normal.png"/>
</sprite>
<sprite name="enter_button_hover">
- <image file="../images/core/worldmap/enter_button_hover.png" />
+ <image file="../images/core/worldmap/enter_button_hover.png"/>
</sprite>
<sprite name="enter_button_pressed">
- <image file="../images/core/worldmap/enter_button_pressed.png" />
+ <image file="../images/core/worldmap/enter_button_pressed.png"/>
</sprite>
<sprite name="leave_button_normal">
- <image file="../images/core/worldmap/leave_button_normal.png" />
+ <image file="../images/core/worldmap/leave_button_normal.png"/>
</sprite>
<sprite name="leave_button_hover">
- <image file="../images/core/worldmap/leave_button_hover.png" />
+ <image file="../images/core/worldmap/leave_button_hover.png"/>
</sprite>
<sprite name="leave_button_pressed">
- <image file="../images/core/worldmap/leave_button_pressed.png" />
+ <image file="../images/core/worldmap/leave_button_pressed.png"/>
</sprite>
<sprite name="story_button_normal">
- <image file="../images/core/worldmap/story_button_normal.png" />
+ <image file="../images/core/worldmap/story_button_normal.png"/>
</sprite>
<sprite name="story_button_hover">
- <image file="../images/core/worldmap/story_button_hover.png" />
+ <image file="../images/core/worldmap/story_button_hover.png"/>
</sprite>
<sprite name="story_button_pressed">
- <image file="../images/core/worldmap/story_button_pressed.png" />
+ <image file="../images/core/worldmap/story_button_pressed.png"/>
</sprite>
<sprite name="credits_button_normal">
- <image file="../images/core/worldmap/credits_button_normal.png" />
+ <image file="../images/core/worldmap/credits_button_normal.png"/>
</sprite>
<sprite name="credits_button_hover">
- <image file="../images/core/worldmap/credits_button_hover.png" />
+ <image file="../images/core/worldmap/credits_button_hover.png"/>
</sprite>
<sprite name="credits_button_pressed">
- <image file="../images/core/worldmap/credits_button_pressed.png" />
+ <image file="../images/core/worldmap/credits_button_pressed.png"/>
</sprite>
</section>
</resources>
Modified: trunk/data/data/game.xml
===================================================================
--- trunk/data/data/game.xml 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/data/data/game.xml 2004-05-07 15:57:09 UTC (rev 2313)
@@ -1,30 +1,70 @@
<resources>
<section name="Game">
- <surface file="../images/core/misc/loading.png" height="66" name="loading"
tcol="0" width="175" x="0" y="0" />
- <surface file="../images/core/misc/pingubw.png" height="400"
name="pingubw" width="307" x="0" y="0" />
- <surface file="../images/core/misc/404.png" height="64" name="404"
width="64" x="0" y="0" />
- <surface file="../images/core/worldmap/dot_green.png" height="12"
name="dot_green" width="32" x="0" y="0" />
- <surface file="../images/core/worldmap/dot_red.png" height="12"
name="dot_red" width="32" x="0" y="0" />
- <surface file="../images/core/worldmap/dot_border.png" height="22"
name="dot_border" tcol="0" width="44" x="0" y="0" />
+ <sprite name="loading">
+ <image file="../images/core/misc/loading.png"/>
+ </sprite>
+ <sprite name="pingubw">
+ <image file="../images/core/misc/pingubw.png"/>
+ </sprite>
+
+ <surface name="404" file="../images/core/misc/404.png" />
+
+ <sprite name="dot_green">
+ <image file="../images/core/worldmap/dot_green.png"/>
+ </sprite>
+ <sprite name="dot_red">
+ <image file="../images/core/worldmap/dot_red.png"/>
+ </sprite>
+ <sprite name="dot_border">
+ <image file="../images/core/worldmap/dot_border.png"/>
+ </sprite>
</section>
<section name="Cursors">
- <surface file="../images/core/cursors/editor.png" height="38"
name="editor" tcol="0" translate-x="19" translate-y="19" width="38" x="0" y="0"
/>
- <surface file="../images/core/cursors/cursor.png" height="16"
name="cursor" tcol="0" width="16" x="0" y="0" />
- <surface file="../images/core/cursors/scroll.png" height="32"
name="scroll_cur" tcol="0" width="32" x="0" y="0" />
- <surface file="../images/core/cursors/cap.png" height="40" name="capgood"
width="40" x="0" y="0" />
- <surface file="../images/core/cursors/capwrong.png" height="40"
name="capbad" width="40" x="0" y="0" />
- <surface file="../images/core/cursors/cross.png" height="40" name="cross"
width="40" x="0" y="0" />
- <surface file="../images/core/cursors/arrow_right.png" height="9"
name="arrow_right" tcol="0" width="23" x="0" y="0" />
- <surface file="../images/core/cursors/arrow_left.png" height="9"
name="arrow_left" tcol="0" width="23" x="0" y="0" />
+ <sprite name="editor">
+ <image file="../images/core/cursors/editor.png"/>
+ </sprite>
+ <sprite name="cursor">
+ <image file="../images/core/cursors/cursor.png"/>
+ </sprite>
+ <sprite name="scroll_cur">
+ <image file="../images/core/cursors/scroll.png"/>
+ </sprite>
+ <sprite name="capgood">
+ <image file="../images/core/cursors/cap.png"/>
+ </sprite>
+ <sprite name="capbad">
+ <image file="../images/core/cursors/capwrong.png"/>
+ </sprite>
+ <sprite name="cross">
+ <image file="../images/core/cursors/cross.png"/>
+ </sprite>
+ <sprite name="arrow_right">
+ <image file="../images/core/cursors/arrow_right.png"/>
+ </sprite>
+ <sprite name="arrow_left">
+ <image file="../images/core/cursors/arrow_left.png"/>
+ </sprite>
</section>
<section name="SmallMap">
- <surface file="../images/core/misc/smallmap_entrance.png" height="6"
name="entrance" width="6" x="0" y="0" />
- <surface file="../images/core/misc/smallmap_exit.png" height="6"
name="exit" width="6" x="0" y="0" />
+ <sprite name="entrance">
+ <image file="../images/core/misc/smallmap_entrance.png"/>
+ </sprite>
+ <sprite name="exit">
+ <image file="../images/core/misc/smallmap_exit.png"/>
+ </sprite>
</section>
<section name="Stars">
- <surface file="../images/backgrounds/large_star.png" height="24"
name="large_star" tcol="0" width="23" x="0" y="0" />
- <surface file="../images/backgrounds/middle_star.png" height="9"
name="middle_star" tcol="0" width="9" x="0" y="0" />
- <surface file="../images/backgrounds/small_star.png" height="6"
name="small_star" tcol="0" width="6" x="0" y="0" />
- <surface file="../images/backgrounds/starfield_icon.png" height="64"
name="starfield_icon" width="64" x="0" y="0" />
+ <sprite name="large_star">
+ <image file="../images/backgrounds/large_star.png"/>
+ </sprite>
+ <sprite name="middle_star">
+ <image file="../images/backgrounds/middle_star.png"/>
+ </sprite>
+ <sprite name="small_star">
+ <image file="../images/backgrounds/small_star.png"/>
+ </sprite>
+ <sprite name="starfield_icon">
+ <image file="../images/backgrounds/starfield_icon.png"/>
+ </sprite>
</section>
</resources>
Modified: trunk/data/data/liquids.xml
===================================================================
--- trunk/data/data/liquids.xml 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/data/data/liquids.xml 2004-05-07 15:57:09 UTC (rev 2313)
@@ -1,13 +1,48 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<resources>
<section name="Liquid">
- <surface file="../images/liquids/water_cmap.png" height="64"
name="water_cmap" width="1" x="0" y="0" />
- <surface array="16x1" file="../images/liquids/water.png" height="32"
name="water" width="32" x="0" y="0" />
- <surface array="12x1" file="../images/liquids/water2.png" height="64"
name="water2" width="64" x="0" y="0" />
- <surface array="8x1" file="../images/liquids/water3.png" height="64"
name="water3" width="64" x="0" y="0" />
- <surface array="8x1" file="../images/liquids/water4.png" height="64"
name="water4" width="64" x="0" y="0" />
- <surface array="4x1" file="../images/liquids/water5.png" height="64"
name="water5" width="64" x="0" y="0" />
- <surface array="4x1" file="../images/liquids/swater.png" height="64"
name="swater" width="64" x="0" y="0" />
- <surface array="12x1" file="../images/liquids/lava.png" height="64"
name="lava" width="64" x="0" y="0" />
- <surface array="12x1" file="../images/liquids/slime.png" height="64"
name="slime" width="64" x="0" y="0" />
+ <sprite name="water_cmap">
+ <image file="../images/liquids/water_cmap.png"/>
+ </sprite>
+ <sprite name="water">
+ <image file="../images/liquids/water.png">
+ <grid pos="0,0" size="32,32" array="16,1"/>
+ </image>
+ </sprite>
+ <sprite name="water2">
+ <image file="../images/liquids/water2.png">
+ <grid pos="0,0" size="64,64" array="12,1"/>
+ </image>
+ </sprite>
+ <sprite name="water3">
+ <image file="../images/liquids/water3.png">
+ <grid pos="0,0" size="64,64" array="8,1"/>
+ </image>
+ </sprite>
+ <sprite name="water4">
+ <image file="../images/liquids/water4.png">
+ <grid pos="0,0" size="64,64" array="8,1"/>
+ </image>
+ </sprite>
+ <sprite name="water5">
+ <image file="../images/liquids/water5.png">
+ <grid pos="0,0" size="64,64" array="4,1"/>
+ </image>
+ </sprite>
+ <sprite name="swater">
+ <image file="../images/liquids/swater.png">
+ <grid pos="0,0" size="64,64" array="4,1"/>
+ </image>
+ </sprite>
+ <sprite name="lava">
+ <image file="../images/liquids/lava.png">
+ <grid pos="0,0" size="64,64" array="12,1"/>
+ </image>
+ </sprite>
+ <sprite name="slime">
+ <image file="../images/liquids/slime.png">
+ <grid pos="0,0" size="64,64" array="12,1"/>
+ </image>
+ </sprite>
</section>
</resources>
Modified: trunk/src/action_button.cxx
===================================================================
--- trunk/src/action_button.cxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/action_button.cxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -87,8 +87,8 @@
VerticalActionButton::VerticalActionButton(ActionHolder* h,
int x, int y, ActionName name_, int
owner_id)
: ActionButton(h),
- background (PingusResource::load_surface("buttons/buttonbackground",
"core")),
- backgroundhl (PingusResource::load_surface("buttons/buttonbackgroundhl",
"core"))
+ background (PingusResource::load_sprite("buttons/buttonbackground",
"core")),
+ backgroundhl (PingusResource::load_sprite("buttons/buttonbackgroundhl",
"core"))
{
init(x, y, name_, owner_id);
}
@@ -173,8 +173,8 @@
: server (s),
x_pos (x),
y_pos (y),
- background (PingusResource::load_surface("buttons/hbuttonbgb", "core")),
- backgroundhl(PingusResource::load_surface("buttons/hbuttonbg", "core"))
+ background (PingusResource::load_sprite("buttons/hbuttonbgb", "core")),
+ backgroundhl(PingusResource::load_sprite("buttons/hbuttonbg", "core"))
{
pressed = false;
sprite = Sprite("buttons/armageddon_anim", "core");
@@ -252,10 +252,10 @@
ForwardButton::ForwardButton (TrueServer* s, int x, int y)
: server (s),
x_pos (x), y_pos (y),
- background (PingusResource::load_surface("buttons/hbuttonbgb", "core")),
- backgroundhl(PingusResource::load_surface("buttons/hbuttonbg", "core"))
+ background (PingusResource::load_sprite("buttons/hbuttonbgb", "core")),
+ backgroundhl(PingusResource::load_sprite("buttons/hbuttonbg", "core"))
{
- surface = PingusResource::load_surface("buttons/fast_forward", "core");
+ surface = PingusResource::load_sprite("buttons/fast_forward", "core");
}
ForwardButton::~ForwardButton () {}
@@ -301,10 +301,10 @@
PauseButton::PauseButton (TrueServer* s, int x, int y)
: server (s),
x_pos(x), y_pos(y),
- background (PingusResource::load_surface("buttons/hbuttonbgb", "core")),
- backgroundhl(PingusResource::load_surface("buttons/hbuttonbg", "core"))
+ background (PingusResource::load_sprite("buttons/hbuttonbgb", "core")),
+ backgroundhl(PingusResource::load_sprite("buttons/hbuttonbg", "core"))
{
- surface = PingusResource::load_surface("buttons/pause", "core");
+ surface = PingusResource::load_sprite("buttons/pause", "core");
}
PauseButton::~PauseButton () {}
Modified: trunk/src/action_button.hxx
===================================================================
--- trunk/src/action_button.hxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/action_button.hxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_ACTION_BUTTON_HXX
#define HEADER_PINGUS_ACTION_BUTTON_HXX
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include <string>
#include "pingu_enums.hxx"
#include "sprite.hxx"
@@ -47,8 +47,8 @@
bool pressed;
float press_time;
Sprite sprite;
- CL_Surface background;
- CL_Surface backgroundhl;
+ CL_Sprite background;
+ CL_Sprite backgroundhl;
friend class ButtonPanel;
public:
@@ -77,9 +77,9 @@
TrueServer* server;
int x_pos;
int y_pos;
- CL_Surface surface;
- CL_Surface background;
- CL_Surface backgroundhl;
+ CL_Sprite surface;
+ CL_Sprite background;
+ CL_Sprite backgroundhl;
friend class ButtonPanel;
public:
ForwardButton(TrueServer*, int x, int y);
@@ -106,9 +106,9 @@
TrueServer* server;
int x_pos;
int y_pos;
- CL_Surface surface;
- CL_Surface background;
- CL_Surface backgroundhl;
+ CL_Sprite surface;
+ CL_Sprite background;
+ CL_Sprite backgroundhl;
friend class ButtonPanel;
public:
PauseButton(TrueServer*, int x, int y);
@@ -175,8 +175,8 @@
class VerticalActionButton : public ActionButton
{
private:
- CL_Surface background;
- CL_Surface backgroundhl;
+ CL_Sprite background;
+ CL_Sprite backgroundhl;
public:
VerticalActionButton(ActionHolder* h, int x, int y, Actions::ActionName
name, int owner_id);
Modified: trunk/src/game_counter.cxx
===================================================================
--- trunk/src/game_counter.cxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/game_counter.cxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -86,11 +86,13 @@
break;
}
}
- if (count >= size || count < 0) {
- std::cout << "GameCounter: Something is wrong..." << std::endl;
- std::cout << "GameCounter: Size: " << size << std::endl;
- std::cout << "GameCounter: Count: " << count << std::endl;
- }
+
+ if ((count >= size || count < 0) && !(count == 0 && size == 0))
+ {
+ std::cout << "GameCounter: Something is wrong..." << std::endl;
+ std::cout << "GameCounter: Size: " << size << std::endl;
+ std::cout << "GameCounter: Count: " << count << std::endl;
+ }
}
int
Modified: trunk/src/gui/display_graphic_context.cxx
===================================================================
--- trunk/src/gui/display_graphic_context.cxx 2004-05-07 11:42:44 UTC (rev
2312)
+++ trunk/src/gui/display_graphic_context.cxx 2004-05-07 15:57:09 UTC (rev
2313)
@@ -163,39 +163,46 @@
void
DisplayGraphicContext::draw (CL_Sprite& sprite, const Vector& pos)
{
- sprite.draw(w2s_x(pos.x), w2s_y(pos.y));
+ if (sprite)
+ sprite.draw(w2s_x(pos.x), w2s_y(pos.y));
}
void
DisplayGraphicContext::draw (CL_Surface& sur, int x_pos, int y_pos)
{
- if (offset.z == 1.0)
+ if (sur)
{
- sur.draw(w2s_x(x_pos), w2s_y(y_pos));
- }
- else
- {
- sur.draw(w2s_x(x_pos), w2s_y(y_pos));
+ if (offset.z == 1.0)
+ {
+ sur.draw(w2s_x(x_pos), w2s_y(y_pos));
+ }
+ else
+ {
+ sur.draw(w2s_x(x_pos), w2s_y(y_pos));
#ifdef CLANLIB_0_6 // scale issue
- offset.z, offset.z);
+ offset.z, offset.z;
#endif
+ }
}
}
void
DisplayGraphicContext::draw (CL_Surface& sur, int x_pos, int y_pos, int frame)
{
- // FIXME: CLANLIB_0_6, no frames in CL_Surface
- if (offset.z == 1.0)
+ if (sur)
{
- sur.draw(w2s_x(x_pos), w2s_y(y_pos));
- }
- else
- {
- sur.draw(w2s_x(x_pos), w2s_y(y_pos));
+ // FIXME: CLANLIB_0_6, no frames in CL_Surface
+ if (offset.z == 1.0)
+ {
+ sur.draw(w2s_x(x_pos), w2s_y(y_pos));
+ }
+ else
+ {
+ sur.draw(w2s_x(x_pos), w2s_y(y_pos));
#ifdef CLANLIB_0_6 // no scale in cl_surface
- offset.z, offset.z);
+ offset.z, offset.z;
#endif
+ }
}
}
@@ -203,7 +210,9 @@
DisplayGraphicContext::draw (CL_Surface& sur, int x_pos, int y_pos,
float size_x, float size_y, int frame)
{
- sur.draw(w2s_x(x_pos), w2s_y(y_pos));
+ if (sur)
+ sur.draw(w2s_x(x_pos), w2s_y(y_pos));
+
#ifdef CLANLIB_0_6
size_x * offset.z,
size_y * offset.z, frame);
Modified: trunk/src/particles/explosive_particle.cxx
===================================================================
--- trunk/src/particles/explosive_particle.cxx 2004-05-07 11:42:44 UTC (rev
2312)
+++ trunk/src/particles/explosive_particle.cxx 2004-05-07 15:57:09 UTC (rev
2313)
@@ -74,7 +74,7 @@
ExplosiveParticle::detonate ()
{
alive = false;
- CL_Surface bomber_radius = PingusResource::load_surface
("Other/bomber_radius", "pingus");
+ CL_PixelBuffer bomber_radius =
PingusResource::load_surface_provider("Other/bomber_radius", "pingus");
WorldObj::get_world()->get_particle_holder ()->add_pingu_explo((int)pos.x,
(int)pos.y);
// FIXME: Ugly do handle the colmap and the gfx map seperatly
Modified: trunk/src/particles/ground_particle.cxx
===================================================================
--- trunk/src/particles/ground_particle.cxx 2004-05-07 11:42:44 UTC (rev
2312)
+++ trunk/src/particles/ground_particle.cxx 2004-05-07 15:57:09 UTC (rev
2313)
@@ -24,7 +24,7 @@
GroundParticle::GroundParticle (int x, int y, float x_a, float y_a)
: Particle (x,y, x_a, y_a)
{
- surface = PingusResource::load_surface("Particles/ground", "pingus");
+ surface = PingusResource::load_sprite("Particles/ground", "pingus");
livetime = 25 + (rand() % 10);
time = livetime;
}
Modified: trunk/src/particles/pingu_particle_holder.cxx
===================================================================
--- trunk/src/particles/pingu_particle_holder.cxx 2004-05-07 11:42:44 UTC
(rev 2312)
+++ trunk/src/particles/pingu_particle_holder.cxx 2004-05-07 15:57:09 UTC
(rev 2313)
@@ -40,7 +40,7 @@
PinguParticleHolder::PinguParticleHolder ()
- : surface(PingusResource::load_surface("Particles/pingu_explo", "pingus"))
+ : surface(PingusResource::load_sprite("Particles/pingu_explo", "pingus"))
{
}
Modified: trunk/src/particles/pingu_particle_holder.hxx
===================================================================
--- trunk/src/particles/pingu_particle_holder.hxx 2004-05-07 11:42:44 UTC
(rev 2312)
+++ trunk/src/particles/pingu_particle_holder.hxx 2004-05-07 15:57:09 UTC
(rev 2313)
@@ -46,7 +46,7 @@
};
private:
- CL_Surface surface;
+ CL_Sprite surface;
std::vector<PinguParticle> particles;
public:
Modified: trunk/src/particles/smoke_particle_holder.cxx
===================================================================
--- trunk/src/particles/smoke_particle_holder.cxx 2004-05-07 11:42:44 UTC
(rev 2312)
+++ trunk/src/particles/smoke_particle_holder.cxx 2004-05-07 15:57:09 UTC
(rev 2313)
@@ -34,8 +34,8 @@
SmokeParticleHolder::SmokeParticleHolder ()
- : surf1(PingusResource::load_surface("Particles/smoke", "pingus")),
- surf2(PingusResource::load_surface("Particles/smoke2", "pingus"))
+ : surf1(PingusResource::load_sprite("Particles/smoke", "pingus")),
+ surf2(PingusResource::load_sprite("Particles/smoke2", "pingus"))
{
}
Modified: trunk/src/particles/smoke_particle_holder.hxx
===================================================================
--- trunk/src/particles/smoke_particle_holder.hxx 2004-05-07 11:42:44 UTC
(rev 2312)
+++ trunk/src/particles/smoke_particle_holder.hxx 2004-05-07 15:57:09 UTC
(rev 2313)
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_PARTICLES_SMOKE_PARTICLE_HOLDER_HXX
#include <vector>
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include "../vector.hxx"
#include "../worldobj.hxx"
@@ -44,8 +44,8 @@
};
private:
- CL_Surface surf1;
- CL_Surface surf2;
+ CL_Sprite surf1;
+ CL_Sprite surf2;
std::vector<SmokeParticle> particles;
Modified: trunk/src/particles/snow_particle_holder.cxx
===================================================================
--- trunk/src/particles/snow_particle_holder.cxx 2004-05-07 11:42:44 UTC
(rev 2312)
+++ trunk/src/particles/snow_particle_holder.cxx 2004-05-07 15:57:09 UTC
(rev 2313)
@@ -58,12 +58,12 @@
SnowParticleHolder::SnowParticleHolder ()
- : snow1 (PingusResource::load_surface("Particles/snow1", "pingus")),
- snow2 (PingusResource::load_surface("Particles/snow2", "pingus")),
- snow3 (PingusResource::load_surface("Particles/snow3", "pingus")),
- snow4 (PingusResource::load_surface("Particles/snow4", "pingus")),
- snow5 (PingusResource::load_surface("Particles/snow5", "pingus")),
- ground(PingusResource::load_surface("Particles/ground_snow", "pingus"))
+ : snow1 (PingusResource::load_sprite("Particles/snow1", "pingus")),
+ snow2 (PingusResource::load_sprite("Particles/snow2", "pingus")),
+ snow3 (PingusResource::load_sprite("Particles/snow3", "pingus")),
+ snow4 (PingusResource::load_sprite("Particles/snow4", "pingus")),
+ snow5 (PingusResource::load_sprite("Particles/snow5", "pingus")),
+ ground(PingusResource::load_sprite("Particles/ground_snow", "pingus"))
{
}
Modified: trunk/src/particles/snow_particle_holder.hxx
===================================================================
--- trunk/src/particles/snow_particle_holder.hxx 2004-05-07 11:42:44 UTC
(rev 2312)
+++ trunk/src/particles/snow_particle_holder.hxx 2004-05-07 15:57:09 UTC
(rev 2313)
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_PARTICLES_SNOW_PARTICLE_HOLDER_HXX
#include <vector>
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include "../vector.hxx"
#include "../worldobj.hxx"
@@ -49,12 +49,12 @@
friend struct SnowParticle;
private:
- CL_Surface snow1;
- CL_Surface snow2;
- CL_Surface snow3;
- CL_Surface snow4;
- CL_Surface snow5;
- CL_Surface ground;
+ CL_Sprite snow1;
+ CL_Sprite snow2;
+ CL_Sprite snow3;
+ CL_Sprite snow4;
+ CL_Sprite snow5;
+ CL_Sprite ground;
std::vector<SnowParticle> particles;
Modified: trunk/src/result_screen.cxx
===================================================================
--- trunk/src/result_screen.cxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/result_screen.cxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -43,7 +43,7 @@
Sprite background;
std::string time_str;
- std::vector<CL_Surface> chalk_pingus;
+ std::vector<CL_Sprite> chalk_pingus;
ResultScreenComponent(Result arg_result);
virtual ~ResultScreenComponent() {}
@@ -145,10 +145,10 @@
background = Sprite("menu/startscreenbg", "core");
background.set_align_center();
- chalk_pingus.push_back(PingusResource::load_surface("misc/chalk_pingu1",
"core"));
- chalk_pingus.push_back(PingusResource::load_surface("misc/chalk_pingu2",
"core"));
- chalk_pingus.push_back(PingusResource::load_surface("misc/chalk_pingu3",
"core"));
- chalk_pingus.push_back(PingusResource::load_surface("misc/chalk_pingu4",
"core"));
+ chalk_pingus.push_back(PingusResource::load_sprite("misc/chalk_pingu1",
"core"));
+ chalk_pingus.push_back(PingusResource::load_sprite("misc/chalk_pingu2",
"core"));
+ chalk_pingus.push_back(PingusResource::load_sprite("misc/chalk_pingu3",
"core"));
+ chalk_pingus.push_back(PingusResource::load_sprite("misc/chalk_pingu4",
"core"));
if (result.max_time == -1)
time_str = "-";
Modified: trunk/src/smallmap.cxx
===================================================================
--- trunk/src/smallmap.cxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/smallmap.cxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -66,8 +66,8 @@
unsigned char current_pixel;
int tx, ty;
- entrance_sur = PingusResource::load_surface("misc/smallmap_entrance",
"core");
- exit_sur = PingusResource::load_surface("misc/smallmap_exit", "core");
+ entrance_sur = PingusResource::load_sprite("misc/smallmap_entrance", "core");
+ exit_sur = PingusResource::load_sprite("misc/smallmap_exit", "core");
ColMap* colmap = client->get_server()->get_world()->get_colmap();
buffer = colmap->get_data();
Modified: trunk/src/smallmap.hxx
===================================================================
--- trunk/src/smallmap.hxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/smallmap.hxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_SMALLMAP_HXX
#define HEADER_PINGUS_SMALLMAP_HXX
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include <ClanLib/Display/pixel_buffer.h>
#include "gui/component.hxx"
@@ -39,10 +39,10 @@
Client* client;
/** Graphic surface of the exit */
- CL_Surface exit_sur;
+ CL_Sprite exit_sur;
/** Graphic surface of the entrance */
- CL_Surface entrance_sur;
+ CL_Sprite entrance_sur;
/** Graphic surface for the generated rectanglar background of the small map
*/
CL_Surface sur;
Modified: trunk/src/spot_map.cxx
===================================================================
--- trunk/src/spot_map.cxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/spot_map.cxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -34,7 +34,7 @@
using namespace WorldObjsData;
-MapTileSurface::MapTileSurface () : empty(true)
+MapTileSurface::MapTileSurface () : empty(false)
{
}
@@ -70,6 +70,7 @@
{
std::cout << "Reload" << std::endl;
surface = CL_Surface(new CL_PixelBuffer(buffer), true);
+ empty = false;
}
void
@@ -78,30 +79,7 @@
empty = false;
}
-void
-MapTileSurface::check_empty()
-{
- // FIXME: obsolete
- unsigned char* bufptr;
- int lenght;
- empty = true;
-
- buffer.lock();
- lenght = buffer.get_pitch() * buffer.get_height();
- bufptr = static_cast<unsigned char*>(buffer.get_data());
-
- // Jumping 4 steps because of RGBA
- for(int i=0; i < lenght; i += 4) {
- if (bufptr[i] != 0) {
- empty = false;
- return;
- }
- }
-
- buffer.unlock();
-}
-
PingusSpotMap::PingusSpotMap(PLF* plf)
{
width = plf->get_width();
Modified: trunk/src/spot_map.hxx
===================================================================
--- trunk/src/spot_map.hxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/spot_map.hxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -52,9 +52,8 @@
CL_Surface get_surface() const { return surface; }
void reload ();
- inline bool is_empty (void) { return empty; }
- void mark_dirty (void);
- void check_empty (void);
+ inline bool is_empty() { return empty; }
+ void mark_dirty ();
void set_empty (bool);
};
Modified: trunk/src/time_display.cxx
===================================================================
--- trunk/src/time_display.cxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/time_display.cxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -36,7 +36,7 @@
TimeDisplay::TimeDisplay (Client* c)
: server(c->get_server()),
- infinity_symbol(PingusResource::load_surface("misc/infinity", "core"))
+ infinity_symbol(PingusResource::load_sprite("misc/infinity", "core"))
{
font = Fonts::pingus_small_fix_num;
}
Modified: trunk/src/time_display.hxx
===================================================================
--- trunk/src/time_display.hxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/time_display.hxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_TIME_DISPLAY_HXX
#define HEADER_PINGUS_TIME_DISPLAY_HXX
-#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/sprite.h>
#include <ClanLib/Display/font.h>
#include "gui/component.hxx"
@@ -35,9 +35,9 @@
class TimeDisplay : public GUI::Component
{
private:
- Server* server;
- CL_Font font;
- CL_Surface infinity_symbol;
+ Server* server;
+ CL_Font font;
+ CL_Sprite infinity_symbol;
public:
TimeDisplay(Client* c);
Modified: trunk/src/worldobjs/liquid.cxx
===================================================================
--- trunk/src/worldobjs/liquid.cxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/worldobjs/liquid.cxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -30,9 +30,8 @@
Liquid::Liquid (const WorldObjsData::LiquidData& data_) :
data(new WorldObjsData::LiquidData(data_)),
- sur(data->desc.res_name,
- data->desc.datafile,
- (data->speed == 0) ? 30 : 1000.0f/data->speed)
+ sur(PingusResource::load_sprite(data->desc))
+ //(data->speed == 0) ? 30 : 1000.0f/data->speed)
{
if (!data->old_width_handling)
data->width *= sur.get_width();
Modified: trunk/src/worldobjs/liquid.hxx
===================================================================
--- trunk/src/worldobjs/liquid.hxx 2004-05-07 11:42:44 UTC (rev 2312)
+++ trunk/src/worldobjs/liquid.hxx 2004-05-07 15:57:09 UTC (rev 2313)
@@ -35,7 +35,7 @@
{
private:
WorldObjsData::LiquidData* const data;
- Sprite sur;
+ CL_Sprite sur;
public:
Liquid (const WorldObjsData::LiquidData& data_);
Modified: trunk/src/worldobjs/surface_background.cxx
===================================================================
--- trunk/src/worldobjs/surface_background.cxx 2004-05-07 11:42:44 UTC (rev
2312)
+++ trunk/src/worldobjs/surface_background.cxx 2004-05-07 15:57:09 UTC (rev
2313)
@@ -100,12 +100,12 @@
data->color.red, data->color.green, data->color.blue,
data->color.alpha);
}
- bg_surface = CL_Surface(new CL_PixelBuffer(canvas), true);
//bg_surface = CAImageManipulation::changeHSV(bg_surface, 150, 100, 0);
counter.set_size(bg_surface.get_frame_count());
counter.set_speed(1.0);
#endif
+ bg_surface = CL_Surface(new CL_PixelBuffer(canvas), true);
timer.stop();
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] rev 2313 - in trunk: data/data src src/gui src/particles src/worldobjs,
Ingo Ruhnke <=