supertux.git
17 years ago- implemented option to switch between up-as-jump and up-as-up (needed to keep worldm...
Ingo Ruhnke [Wed, 22 Aug 2007 04:33:47 +0000 (04:33 +0000)]
- implemented option to switch between up-as-jump and up-as-up (needed to keep worldmap usable)

SVN-Revision: 5153

17 years ago- general cleanup
Ingo Ruhnke [Tue, 21 Aug 2007 23:41:56 +0000 (23:41 +0000)]
- general cleanup
- fixed bug which caused new bindings not getting accepted

SVN-Revision: 5152

17 years agoadded a missing include line.
Stephen Groundwater [Tue, 21 Aug 2007 22:42:21 +0000 (22:42 +0000)]
added a missing include line.

SVN-Revision: 5151

17 years ago- configurable joystick hat support
Ingo Ruhnke [Tue, 21 Aug 2007 21:46:28 +0000 (21:46 +0000)]
- configurable joystick hat support

SVN-Revision: 5150

17 years agoSDL: Remove the alpha channel and approximate with a colorkey if the texture doesn...
Tim Goya [Tue, 21 Aug 2007 16:11:33 +0000 (16:11 +0000)]
SDL: Remove the alpha channel and approximate with a colorkey if the texture doesn't have too many semitransparent pixels, support request.alpha in draw_surface and draw_surface_part for textures that don't have an alpha channel

SVN-Revision: 5149

17 years agoSDL: use SDL_DisplayFormat instead of SDL_DisplayFormatAlpha for images that don...
Tim Goya [Tue, 21 Aug 2007 00:28:52 +0000 (00:28 +0000)]
SDL: use SDL_DisplayFormat instead of SDL_DisplayFormatAlpha for images that don't use alpha or don't have an alpha channel, huge speedup

SVN-Revision: 5148

17 years ago'auto' option that always picks what it thinks is the best renderer.
Tim Goya [Mon, 20 Aug 2007 17:15:04 +0000 (17:15 +0000)]
'auto' option that always picks what it thinks is the best renderer.

SVN-Revision: 5147

17 years ago- implemented load/save of joystick config
Ingo Ruhnke [Sun, 19 Aug 2007 02:04:18 +0000 (02:04 +0000)]
- implemented load/save of joystick config

SVN-Revision: 5146

17 years ago- added more flexible joystick options (axis can now be mapped to jump and stuff)
Ingo Ruhnke [Sun, 19 Aug 2007 01:10:40 +0000 (01:10 +0000)]
- added more flexible joystick options (axis can now be mapped to jump and stuff)

SVN-Revision: 5145

17 years agoSDL: Implement lightmaps smaller than the screen size. LIGHTMAP_DIV is calculated...
Tim Goya [Sat, 18 Aug 2007 22:11:20 +0000 (22:11 +0000)]
SDL: Implement lightmaps smaller than the screen size.  LIGHTMAP_DIV is calculated such that the resulting lightmap size is or close to 100x75.  Hopefully it isn't too grainy, but bilinear filtering is way too slow

SVN-Revision: 5144

17 years agoPrecalculated renderer specific surface data, better management of multiple renderers...
Tim Goya [Sat, 18 Aug 2007 01:21:26 +0000 (01:21 +0000)]
Precalculated renderer specific surface data, better management of multiple renderers (all the big switches in one file and uses an enum), symbolic names for commonly used colors.

SVN-Revision: 5143

17 years agoSDL: remove pointless refcount acrobatics on video surface when taking screenshot
Tim Goya [Fri, 17 Aug 2007 00:21:35 +0000 (00:21 +0000)]
SDL: remove pointless refcount acrobatics on video surface when taking screenshot

SVN-Revision: 5142

17 years agoSDL: slight performance boost to lightmaps
Tim Goya [Fri, 17 Aug 2007 00:19:44 +0000 (00:19 +0000)]
SDL: slight performance boost to lightmaps

SVN-Revision: 5141

17 years agoSDL: use hash table for color cache
Tim Goya [Fri, 17 Aug 2007 00:18:17 +0000 (00:18 +0000)]
SDL: use hash table for color cache

SVN-Revision: 5140

17 years agoFix problems with ordering and dependencies when initializing OpenGL drawing context
Tim Goya [Wed, 15 Aug 2007 19:39:29 +0000 (19:39 +0000)]
Fix problems with ordering and dependencies when initializing OpenGL drawing context

SVN-Revision: 5139

17 years agoRefactored video/ subsystem to make adding other methods of rendering (in particular...
Tim Goya [Wed, 15 Aug 2007 01:02:22 +0000 (01:02 +0000)]
Refactored video/ subsystem to make adding other methods of rendering (in particular pure SDL) easier and more maintainable.  Implemented pure SDL rendering based on the nogl patch.  Lightmaps are implemented for pure SDL as well.

SVN-Revision: 5138

17 years agoFixed bug #229 "apparent attempt to respawn in solid spot under shattered bridge...
Arvid Norlander [Wed, 25 Jul 2007 07:22:35 +0000 (07:22 +0000)]
Fixed bug #229 "apparent attempt to respawn in solid spot under shattered bridge checkpoint"

SVN-Revision: 5137

17 years ago- new iceshrub
Ingo Ruhnke [Tue, 24 Jul 2007 22:56:00 +0000 (22:56 +0000)]
- new iceshrub

SVN-Revision: 5136

17 years agoAdded Romanian Translation by Dajboc Razvan
Christoph Sommer [Mon, 23 Jul 2007 15:46:52 +0000 (15:46 +0000)]
Added Romanian Translation by Dajboc Razvan

SVN-Revision: 5135

17 years agoReworked spider web castle image, moved around an updated window image. An updated...
Stephen Groundwater [Mon, 23 Jul 2007 12:33:25 +0000 (12:33 +0000)]
Reworked spider web castle image, moved around an updated window image. An updated window was squeezed into the spiderweb image - I may have broken some levels by doing this. The window has a backgroung now for both blue and grey brick/blocks. Changed to the the static walltorch.png to be the off position of the new walltorch animated tiles.

SVN-Revision: 5134

17 years agoGave older torch tile an animation set, fixed window image to better fit in christoph...
Stephen Groundwater [Sun, 22 Jul 2007 00:28:38 +0000 (00:28 +0000)]
Gave older torch tile an animation set, fixed window image to better fit in christophD level.

SVN-Revision: 5133

17 years agoTesting a change to the nolok sketch, first commit to repo.
Stephen Groundwater [Thu, 19 Jul 2007 11:30:07 +0000 (11:30 +0000)]
Testing a change to the nolok sketch, first commit to repo.

SVN-Revision: 5132

17 years agoAdded translations to Finnish (by Jan) and Norwegian Bokmal (by Karl), updated transl...
Christoph Sommer [Sun, 15 Jul 2007 21:07:26 +0000 (21:07 +0000)]
Added translations to Finnish (by Jan) and Norwegian Bokmal (by Karl), updated translation to Danish (by Anders).

SVN-Revision: 5131

17 years agoIspy should now "really" be written out.
Ondřej Hošek [Thu, 12 Jul 2007 11:11:55 +0000 (11:11 +0000)]
Ispy should now "really" be written out.

SVN-Revision: 5130

17 years ago* Added English as a static entry into the language menu. (We don't have an en.po.)
Ondřej Hošek [Thu, 12 Jul 2007 10:53:10 +0000 (10:53 +0000)]
* Added English as a static entry into the language menu. (We don't have an en.po.)
* Made Mr Bomb preload the "explosion" sound on creation. Otherwise, if the first Mr Bomb in a level is killed e.g. by Star Power, the game stutters.

SVN-Revision: 5129

17 years agoFixed two incorrect stone tiles in christophE.stl
Arvid Norlander [Thu, 5 Jul 2007 11:29:38 +0000 (11:29 +0000)]
Fixed two incorrect stone tiles in christophE.stl

SVN-Revision: 5128

17 years agoMinor improvements
Christoph Sommer [Tue, 3 Jul 2007 19:39:25 +0000 (19:39 +0000)]
Minor improvements

SVN-Revision: 5127

17 years agoAdd missing file of Norwegian Nynorsk translation
Tim Goya [Tue, 3 Jul 2007 00:15:22 +0000 (00:15 +0000)]
Add missing file of Norwegian Nynorsk translation

SVN-Revision: 5121

17 years agoNormalized level after adding support for object to editor
Arvid Norlander [Mon, 2 Jul 2007 22:47:27 +0000 (22:47 +0000)]
Normalized level after adding support for object to editor

SVN-Revision: 5119

17 years agoIspy
Christoph Sommer [Mon, 2 Jul 2007 22:00:36 +0000 (22:00 +0000)]
Ispy

SVN-Revision: 5116

17 years agoNorwegian Nynorsk translation update
Tim Goya [Sun, 1 Jul 2007 13:47:35 +0000 (13:47 +0000)]
Norwegian Nynorsk translation update

SVN-Revision: 5115

17 years agoupdate Norwegian Nynorsk translation
Tim Goya [Sun, 1 Jul 2007 02:21:32 +0000 (02:21 +0000)]
update Norwegian Nynorsk translation

SVN-Revision: 5114

17 years agoAdded menu option to select language
Christoph Sommer [Sun, 24 Jun 2007 10:20:19 +0000 (10:20 +0000)]
Added menu option to select language

SVN-Revision: 5113

17 years agoDemoted buggy tilemap data warning to DEBUG level, because it tends to pop up in...
Christoph Sommer [Sun, 24 Jun 2007 10:19:26 +0000 (10:19 +0000)]
Demoted buggy tilemap data warning to DEBUG level, because it tends to pop up in perfectly fine worldmaps

SVN-Revision: 5112

17 years agoTwo new toys to play with
Christoph Sommer [Mon, 18 Jun 2007 22:30:30 +0000 (22:30 +0000)]
Two new toys to play with

SVN-Revision: 5111

17 years agoFixed Rocks being flagged as on the ground while they are carried
Christoph Sommer [Sun, 17 Jun 2007 09:33:58 +0000 (09:33 +0000)]
Fixed Rocks being flagged as on the ground while they are carried

SVN-Revision: 5110

17 years agoPolished manpage a bit
Christoph Sommer [Sat, 16 Jun 2007 23:51:31 +0000 (23:51 +0000)]
Polished manpage a bit

SVN-Revision: 5109

17 years agoKeep fire on backflip. Image still missing
Wolfgang Becker [Sat, 16 Jun 2007 17:03:27 +0000 (17:03 +0000)]
Keep fire on backflip. Image still missing

SVN-Revision: 5108

17 years agoEnlarged Dart hitbox to work around Darts shooting through walls (resolves issue 37)
Christoph Sommer [Sat, 16 Jun 2007 13:19:15 +0000 (13:19 +0000)]
Enlarged Dart hitbox to work around Darts shooting through walls (resolves issue 37)

SVN-Revision: 5107

17 years agoUpdated Danish translation
Christoph Sommer [Sat, 16 Jun 2007 12:08:23 +0000 (12:08 +0000)]
Updated Danish translation

SVN-Revision: 5106

17 years agoMoved Explosion object to foreground, changed Mr. Rocket to use Explosion object...
Christoph Sommer [Wed, 13 Jun 2007 20:18:42 +0000 (20:18 +0000)]
Moved Explosion object to foreground, changed Mr. Rocket to use Explosion object, too. Cleaned up code.

SVN-Revision: 5105

17 years agoAdded new "Explosion" object
Christoph Sommer [Wed, 13 Jun 2007 19:43:08 +0000 (19:43 +0000)]
Added new "Explosion" object

SVN-Revision: 5104

17 years agoFixed typo in Block.cpp that kept bonus blocks from knocking (temporarily) non(!...
Christoph Sommer [Wed, 13 Jun 2007 18:27:37 +0000 (18:27 +0000)]
Fixed typo in Block.cpp that kept bonus blocks from knocking (temporarily) non(!)-portable badguys (resolves issue 225)

SVN-Revision: 5103

17 years agoAdding test level for http://supertux.lethargik.org/bugs/view.php?id=225
Arvid Norlander [Wed, 13 Jun 2007 16:57:29 +0000 (16:57 +0000)]
Adding test level for supertux.lethargik.org/bugs/view.php?id=225

SVN-Revision: 5102

17 years agoSome fixes for 64-bit after tuxdev told me how to fix. ;)
Arvid Norlander [Tue, 12 Jun 2007 18:51:48 +0000 (18:51 +0000)]
Some fixes for 64-bit after tuxdev told me how to fix. ;)

SVN-Revision: 5084

17 years agoAnother small fix to a level
Arvid Norlander [Mon, 11 Jun 2007 19:55:12 +0000 (19:55 +0000)]
Another small fix to a level

SVN-Revision: 5081

17 years agoMinor fix to level
Arvid Norlander [Mon, 11 Jun 2007 19:50:47 +0000 (19:50 +0000)]
Minor fix to level

SVN-Revision: 5080

17 years agoUpdates to Swedish translation
Arvid Norlander [Mon, 11 Jun 2007 19:35:21 +0000 (19:35 +0000)]
Updates to Swedish translation

SVN-Revision: 5079

17 years agoUpdated windows installer to new binary name, NOTE NOT TESTED (I'm on Linux)
Arvid Norlander [Mon, 11 Jun 2007 19:01:38 +0000 (19:01 +0000)]
Updated windows installer to new binary name, NOTE NOT TESTED (I'm on Linux)

SVN-Revision: 5077

17 years ago*Fixed duplicated tile 628 on worldmap tile definition
Wolfgang Becker [Mon, 11 Jun 2007 18:36:15 +0000 (18:36 +0000)]
*Fixed duplicated tile 628 on worldmap tile definition
*Adjust editor to changed executable name
*Made treeboss level a bit brighter

SVN-Revision: 5076

17 years agomake nogl work for resolutions other than 800x600
Tim Goya [Sun, 10 Jun 2007 17:47:07 +0000 (17:47 +0000)]
make nogl work for resolutions other than 800x600

SVN-Revision: 5072

17 years agoUpdated Swedish translation
Arvid Norlander [Sun, 10 Jun 2007 08:59:54 +0000 (08:59 +0000)]
Updated Swedish translation

SVN-Revision: 5071

17 years agoMake nogl patch not need OpenGL at all
Tim Goya [Fri, 8 Jun 2007 16:26:17 +0000 (16:26 +0000)]
Make nogl patch not need OpenGL at all

SVN-Revision: 5070

17 years agoCleaned up Ghost Particle speed calculation. Closes issue 220.
Christoph Sommer [Thu, 7 Jun 2007 16:30:50 +0000 (16:30 +0000)]
Cleaned up Ghost Particle speed calculation. Closes issue 220.

SVN-Revision: 5069

17 years agosupport screenshots in the nogl patch
Tim Goya [Wed, 30 May 2007 16:52:47 +0000 (16:52 +0000)]
support screenshots in the nogl patch

SVN-Revision: 5068

17 years agoUpdated nogl patch. Side-by-side with OpenGL version, No SDL_gfx requirement, faster...
Tim Goya [Tue, 29 May 2007 20:15:51 +0000 (20:15 +0000)]
Updated nogl patch.  Side-by-side with OpenGL version, No SDL_gfx requirement, faster gradients

SVN-Revision: 5067

17 years agoTried changing .desktop according to recommendations of freedesktop.org and the GNOME HIG
Christoph Sommer [Sun, 27 May 2007 22:38:42 +0000 (22:38 +0000)]
Tried changing .desktop according to recommendations of freedesktop.org and the GNOME HIG

SVN-Revision: 5065

17 years agoPlatforms without a name that start with "running" set to false will now pick destina...
Christoph Sommer [Sun, 27 May 2007 21:51:46 +0000 (21:51 +0000)]
Platforms without a name that start with "running" set to false will now pick destinations automatically

SVN-Revision: 5064

17 years agofix broken color state management
Matthias Braun [Sun, 27 May 2007 11:32:00 +0000 (11:32 +0000)]
fix broken color state management

SVN-Revision: 5063

17 years agoplay around with scripted willos
Matthias Braun [Sun, 27 May 2007 10:50:29 +0000 (10:50 +0000)]
play around with scripted willos

SVN-Revision: 5062

17 years agoUpdate for -nogl patch.
Wolfgang Becker [Sun, 27 May 2007 10:46:57 +0000 (10:46 +0000)]
Update for -nogl patch.

SVN-Revision: 5061

17 years agomore willo changes
Matthias Braun [Sun, 27 May 2007 10:46:08 +0000 (10:46 +0000)]
more willo changes

SVN-Revision: 5060

17 years agoLet treewillowisp glow. Not perfect for blue ones.
Wolfgang Becker [Sun, 27 May 2007 10:37:17 +0000 (10:37 +0000)]
Let treewillowisp glow. Not perfect for blue ones.

SVN-Revision: 5059

17 years agoupdated wisphunt music
Marek Moeckel [Sun, 27 May 2007 10:14:05 +0000 (10:14 +0000)]
updated wisphunt music

SVN-Revision: 5058

17 years agoremove dead_script_hint, add scripting capabilities to willowisp, willowisps can...
Matthias Braun [Sun, 27 May 2007 10:01:09 +0000 (10:01 +0000)]
remove dead_script_hint, add scripting capabilities to willowisp, willowisps can have paths now

SVN-Revision: 5057

17 years agomade transition.stl a little longer
Marek Moeckel [Sun, 27 May 2007 09:16:22 +0000 (09:16 +0000)]
made transition.stl a little longer

SVN-Revision: 5054

17 years agomusic for transition.stl
Marek Moeckel [Sun, 27 May 2007 09:11:19 +0000 (09:11 +0000)]
music for transition.stl

SVN-Revision: 5053

17 years agotest level for a new ghost forest transition idea
Marek Moeckel [Sun, 27 May 2007 08:55:15 +0000 (08:55 +0000)]
test level for a new ghost forest transition idea

SVN-Revision: 5052

17 years agomusic script for theme.ogg
Marek Moeckel [Sat, 26 May 2007 22:11:31 +0000 (22:11 +0000)]
music script for theme.ogg

SVN-Revision: 5051

17 years agoUpdated levels using music/forest.ogg to use music/forest.music
Arvid Norlander [Sat, 26 May 2007 22:07:05 +0000 (22:07 +0000)]
Updated levels using music/forest.ogg to use music/forest.music

SVN-Revision: 5050

17 years agomusic script file for forest.ogg
Marek Moeckel [Sat, 26 May 2007 21:51:09 +0000 (21:51 +0000)]
music script file for forest.ogg

SVN-Revision: 5049

17 years agoround not chop so it isn't calculating strange WIDTH and HEIGHT
Matthias Braun [Sat, 26 May 2007 21:39:41 +0000 (21:39 +0000)]
round not chop so it isn't calculating strange WIDTH and HEIGHT

SVN-Revision: 5048

17 years agofix looping for normal .ogg
Matthias Braun [Sat, 26 May 2007 21:12:39 +0000 (21:12 +0000)]
fix looping for normal .ogg

SVN-Revision: 5047

17 years agoFixed bbox misalignment
Christoph Sommer [Sat, 26 May 2007 21:10:16 +0000 (21:10 +0000)]
Fixed bbox misalignment

SVN-Revision: 5046

17 years agoremove old desktop file
Wolfgang Becker [Sat, 26 May 2007 21:01:18 +0000 (21:01 +0000)]
remove old desktop file

SVN-Revision: 5045

17 years agomusic script file for bossattack.ogg
Marek Moeckel [Sat, 26 May 2007 20:56:31 +0000 (20:56 +0000)]
music script file for bossattack.ogg

SVN-Revision: 5044

17 years agocast before comparing
Matthias Braun [Sat, 26 May 2007 20:48:27 +0000 (20:48 +0000)]
cast before comparing

SVN-Revision: 5043

17 years agolooping treeboss music
Matthias Braun [Sat, 26 May 2007 20:45:30 +0000 (20:45 +0000)]
looping treeboss music

SVN-Revision: 5042

17 years agonew filetype .music that allows to specify loop points in the music after the intro
Matthias Braun [Sat, 26 May 2007 20:44:03 +0000 (20:44 +0000)]
new filetype .music that allows to specify loop points in the music after the intro

SVN-Revision: 5041

17 years agoGhostTree can now be killed
Christoph Sommer [Sat, 26 May 2007 20:37:50 +0000 (20:37 +0000)]
GhostTree can now be killed

SVN-Revision: 5040

17 years agonew version of treeboss.ogg (but still bad quality)
Marek Moeckel [Sat, 26 May 2007 20:37:38 +0000 (20:37 +0000)]
new version of treeboss.ogg (but still bad quality)

SVN-Revision: 5039

17 years agoChanged default location and binary name to supertux2 for coexistence with MS1.
Wolfgang Becker [Sat, 26 May 2007 19:35:43 +0000 (19:35 +0000)]
Changed default location and binary name to supertux2 for coexistence with MS1.

SVN-Revision: 5036

17 years agosome new GhostTree stuff
Christoph Sommer [Sat, 26 May 2007 18:50:16 +0000 (18:50 +0000)]
some new GhostTree stuff

SVN-Revision: 5035

17 years agoDelayed root hatching
Christoph Sommer [Sat, 26 May 2007 17:42:23 +0000 (17:42 +0000)]
Delayed root hatching

SVN-Revision: 5034

17 years agoAdded to ghosttree: roots growing from below
Christoph Sommer [Sat, 26 May 2007 17:32:29 +0000 (17:32 +0000)]
Added to ghosttree: roots growing from below

SVN-Revision: 5033

17 years agoplay sound when willowisp is caught
Wolfgang Becker [Sat, 26 May 2007 17:30:03 +0000 (17:30 +0000)]
play sound when willowisp is caught

SVN-Revision: 5032

17 years agoadded willowisp catch sound
Matthias Braun [Sat, 26 May 2007 17:17:03 +0000 (17:17 +0000)]
added willowisp catch sound

SVN-Revision: 5031

17 years agouse the tree sounds
Matthias Braun [Sat, 26 May 2007 17:02:21 +0000 (17:02 +0000)]
use the tree sounds

SVN-Revision: 5030

17 years agosounds for the tree
Matthias Braun [Sat, 26 May 2007 17:02:14 +0000 (17:02 +0000)]
sounds for the tree

SVN-Revision: 5029

17 years agoyou can compare colors now
Matthias Braun [Sat, 26 May 2007 16:43:52 +0000 (16:43 +0000)]
you can compare colors now

SVN-Revision: 5028

17 years agofirst tries at sucking
Matthias Braun [Sat, 26 May 2007 16:40:12 +0000 (16:40 +0000)]
first tries at sucking

SVN-Revision: 5027

17 years agowe need a break here not a return, so not everything stops
Matthias Braun [Sat, 26 May 2007 15:54:58 +0000 (15:54 +0000)]
we need a break here not a return, so not everything stops

SVN-Revision: 5026

17 years agowillowisp position relative to ghosttree now, ghosttree is notified from vanished...
Matthias Braun [Sat, 26 May 2007 15:41:46 +0000 (15:41 +0000)]
willowisp position relative to ghosttree now, ghosttree is notified from vanished willos

SVN-Revision: 5025

17 years ago(Tree)WillOWisps no longer collide with closed lamps.
Christoph Sommer [Sat, 26 May 2007 15:36:06 +0000 (15:36 +0000)]
(Tree)WillOWisps no longer collide with closed lamps.
TreeWillOWisps now hurt Tux.

SVN-Revision: 5024

17 years agohack to make movingobject vs. static also call the collides function of the moving...
Matthias Braun [Sat, 26 May 2007 15:23:22 +0000 (15:23 +0000)]
hack to make movingobject vs. static also call the collides function of the moving object

SVN-Revision: 5023

17 years agonew test level for the ghost tree
Marek Moeckel [Sat, 26 May 2007 15:00:26 +0000 (15:00 +0000)]
new test level for the ghost tree

SVN-Revision: 5022

17 years agoNew explosion sound. Selfmade, GPLv2+/CC-by-sa
Christoph Sommer [Sat, 26 May 2007 14:52:49 +0000 (14:52 +0000)]
New explosion sound. Selfmade, GPLv2+/CC-by-sa

SVN-Revision: 5021

17 years agoLimit coin sound to be played at most once every 10ms
Christoph Sommer [Sat, 26 May 2007 14:34:05 +0000 (14:34 +0000)]
Limit coin sound to be played at most once every 10ms

SVN-Revision: 5020

17 years agoWillOWisp badguys can now be trapped inside empty Lanterns.
Christoph Sommer [Sat, 26 May 2007 14:21:12 +0000 (14:21 +0000)]
WillOWisp badguys can now be trapped inside empty Lanterns.
Added MatzeB's drafts of World2 boss, the ghost tree.

SVN-Revision: 5019

17 years agoextend moving_object with a collides function that allows an early veto of collision...
Matthias Braun [Sat, 26 May 2007 14:15:22 +0000 (14:15 +0000)]
extend moving_object with a collides function that allows an early veto of collision partners, this nicely fixes invisible block problems

SVN-Revision: 5018