zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: UseType was not properly set for textures defined in TEXTURES.

Browse source 
- Fixed: You couldn't set an offset for sprites defined in TEXTURES.
- Fixed some problems with last revision.

SVN r1040 (trunk)
This commit is contained in:
Christoph Oelckers 2008-06-16 07:40:28 +00:00
parent d4c8cdf45a
commit de53c3cd4c
5 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/rh-log.txt
View file

@ -1,4 +1,6 @@
June 16, 2008 (Changes by Graf Zahl) June 16, 2008 (Changes by Graf Zahl)
- Fixed: UseType was not properly set for textures defined in TEXTURES.
- Fixed: You couldn't set an offset for sprites defined in TEXTURES.
- Added read barriers to all actor pointers within player_t except for - Added read barriers to all actor pointers within player_t except for
mo, ReadyWeapon and PendingWeapon. mo, ReadyWeapon and PendingWeapon.

2
src/d_player.h
View file

@ -275,7 +275,7 @@ public:
angle_t angle; // The wanted angle that the bot try to get every tic. angle_t angle; // The wanted angle that the bot try to get every tic.
// (used to get a smoth view movement) // (used to get a smoth view movement)
TobjPtr<AActor> dest; // Move Destination. TObjPtr<AActor> dest; // Move Destination.
TObjPtr<AActor> prev; // Previous move destination. TObjPtr<AActor> prev; // Previous move destination.

10
src/m_menu.cpp
View file

@ -3135,12 +3135,14 @@ void M_Drawer ()
int i, x, y, max; int i, x, y, max;
PalEntry fade = 0; PalEntry fade = 0;
const player_t *player = &players[consoleplayer]; player_t *player = &players[consoleplayer];
if (!screen->Accel2D && player->camera != NULL && (gamestate == GS_LEVEL || gamestate == GS_TITLELEVEL)) AActor *camera = player->camera;
if (!screen->Accel2D && camera != NULL && (gamestate == GS_LEVEL || gamestate == GS_TITLELEVEL))
{ {
if (player->camera->player != NULL) if (camera->player != NULL)
{ {
player = player->camera->player; player = camera->player;
} }
fade = PalEntry (BYTE(player->BlendA*255), BYTE(player->BlendR*255), BYTE(player->BlendG*255), BYTE(player->BlendB*255)); fade = PalEntry (BYTE(player->BlendA*255), BYTE(player->BlendR*255), BYTE(player->BlendG*255), BYTE(player->BlendB*255));
} }

2
src/p_user.cpp
View file

@ -322,7 +322,7 @@ size_t player_t::FixPointers (const DObject *old, DObject *rep)
if (last_mate == old) last_mate = replacement, changed++; if (last_mate == old) last_mate = replacement, changed++;
if (ReadyWeapon == old) ReadyWeapon = static_cast<AWeapon *>(rep), changed++; if (ReadyWeapon == old) ReadyWeapon = static_cast<AWeapon *>(rep), changed++;
if (PendingWeapon == old) PendingWeapon = static_cast<AWeapon *>(rep), changed++; if (PendingWeapon == old) PendingWeapon = static_cast<AWeapon *>(rep), changed++;
if (PremorphWeapon == old) PremorphWeaon = static_cast<AWeapon *>(rep), changed++; if (PremorphWeapon == old) PremorphWeapon = static_cast<AWeapon *>(rep), changed++;
if (ConversationNPC == old) ConversationNPC = replacement, changed++; if (ConversationNPC == old) ConversationNPC = replacement, changed++;
if (ConversationPC == old) ConversationPC = replacement, changed++; if (ConversationPC == old) ConversationPC = replacement, changed++;
return changed; return changed;

15
src/textures/multipatchtexture.cpp
View file

@ -1166,7 +1166,7 @@ FMultiPatchTexture::FMultiPatchTexture (FScanner &sc, int usetype)
sc.MustGetStringName(","); sc.MustGetStringName(",");
sc.MustGetNumber(); sc.MustGetNumber();
Height = sc.Number; Height = sc.Number;
UseType = FTexture::TEX_Override; UseType = usetype;
if (sc.CheckString("{")) if (sc.CheckString("{"))
{ {
@ -1203,6 +1203,18 @@ FMultiPatchTexture::FMultiPatchTexture (FScanner &sc, int usetype)
part.Texture = NULL; part.Texture = NULL;
part.Translation = NULL; part.Translation = NULL;
} }
else if (sc.Compare("Offset"))
{
sc.MustGetNumber();
LeftOffset = sc.Number;
sc.MustGetStringName(",");
sc.MustGetNumber();
TopOffset = sc.Number;
}
else
{
sc.ScriptError("Unknown texture property '%s'", sc.String);
}
} }
NumParts = parts.Size(); NumParts = parts.Size();
@ -1223,7 +1235,6 @@ FMultiPatchTexture::FMultiPatchTexture (FScanner &sc, int usetype)
bRedirect = true; bRedirect = true;
} }
} }
//DefinitionLump = sc.G deflumpnum;
} }
sc.SetCMode(false); sc.SetCMode(false);
} }