Skip to content

Commit

Permalink
Drop unimplemented sky scrolling for now
Browse files Browse the repository at this point in the history
  • Loading branch information
kraflab committed Aug 13, 2023
1 parent 08cfc74 commit 0cfe610
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/mapinfo.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Appends properties to the default map.
| **Next = _various_** | The behavior when the normal exit is triggered. The following options are supported: <ul> <li>**"\<MapLump\>":** Enter the given map.</li> <li>**EndPic, "\<Lump\>":** End the game, displaying the given lump as an image.</li> <li>**"EndGame1":** End the game, displaying the image from Doom E1.</li> <li>**"EndGame2":** End the game, displaying the image from Doom E2.</li> <li>**"EndGame3":** End the game, displaying the horizontal scroller from Doom E3.</li> <li>**"EndGame4":** End the game, displaying the image from Doom E4.</li> <li>**"EndGameC":** End the game, displaying the cast from Doom 2.</li> <li>**EndGame { _properties_ }:** End the game with custom properties: <ul> <li>**Pic = "\<Lump\>":** Display the given lump as an image. If combined with **Cast**, sets the cast background.</li> <li>**HScroll = "\<RightLump\>", "\<LeftLump\>":** Display the horizontal scroller using the given lumps as images.</li> <li>**Cast:** Display the cast.</li> <li>**Music = "\<Lump\>"[, \<Loop\>]:** Play the given lump as music. Optionally set whether the music should loop (1) or not (0). Music loops by default.</li> </ul> If multiple of **Pic**, **HScroll**, and **Cast** are used, only the last one will be used to decide the end game version. </li> </ul> |
| **SecretNext = _various_** | The behavior when the secret exit is triggered. See the description of **Next** for options. |
| **Cluster = \<Int\>** | The cluster number the map belongs to. |
| **Sky1 = "\<Texture\>[, \<ScrollSpeed\>]** | The texture used for the sky. Optionally, supply a scrolling speed (default is 0.0). |
| **Sky1 = "\<Texture\>"** | The texture used for the sky. |
| **TitlePatch = "\<Patch\>"[, \<HideAuthorName\>]** | The title patch used on the intermission screen. By default, a graphic will be constructed from the map's **NiceName**. By default, the author name is also shown on the intermission screen. Use a 1 for **HideAuthorName** to hide it instead. |
| **Par = \<Time\>** | Par time (in seconds) shown on the intermission screen. |
| **Music = "\<Lump\>"** | The music that plays during the map. |
Expand Down
4 changes: 2 additions & 2 deletions prboom2/src/dsda/mapinfo/doom/parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,10 @@ static void dsda_ParseDoomMapInfoMapSky(Scanner &scanner, doom_mapinfo_sky_t &sk
STR_DUP(sky.lump);
if (scanner.CheckToken(',')) {
scanner.MustGetFloat();
sky.scrollspeed = scanner.decimal;
// sky.scrollspeed = scanner.decimal;
}
else {
sky.scrollspeed = 0.0;
// sky.scrollspeed = 0.0;
}
}

Expand Down
2 changes: 1 addition & 1 deletion prboom2/src/dsda/mapinfo/doom/parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ typedef struct {

typedef struct {
char* lump;
float scrollspeed;
// float scrollspeed;
} doom_mapinfo_sky_t;

typedef struct {
Expand Down

0 comments on commit 0cfe610

Please sign in to comment.