teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-12-04 01:51:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze/source/build/src/defs.cpp

3210 lines
111 KiB
C++
Raw Normal View History

Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
/*
* Definitions file parser for Build
Fix JonoF's email address. git-svn-id: https://svn.eduke32.com/eduke32@2456 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-12 04:47:04 +00:00
* by Jonathon Fowler (jf@jonof.id.au)
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
* Remixed substantially by Ken Silverman
* See the included license file "BUILDLIC.TXT" for license info.
*/
#include "build.h"
#include "compat.h"
Hook basepal up to highpal. git-svn-id: https://svn.eduke32.com/eduke32@1782 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-27 07:05:12 +00:00
#include "engine_priv.h"
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
#include "scriptfile.h"
- SW sound WIP * removed old sound loading code, which was the last bit to use cacheAllocateBlock which is also gone now. * cleanup of player sound code. All game side tracking of the sound resources has been removed. does not compile yet.
2019-12-17 22:25:07 +00:00
Fix POLYMER=0 build, cleaning up #include discipline on the way. Also taking care that the USE_OPENGL=0 build builds. git-svn-id: https://svn.eduke32.com/eduke32@3467 1a8010ca-5511-0410-912e-c29ae57300e0
2013-02-07 21:01:24 +00:00
#include "mdsprite.h" // md3model_t
- split up textures.h.
2020-05-24 05:58:56 +00:00
#include "buildtiles.h"
- added a texture class for ART-format hightiles. This allows to treat them like all other image formats.
2019-10-05 21:44:28 +00:00
#include "bitmap.h"
- cleanup of the old file system initialization. The real fun part is yet to come, i.e. removing the remaining dependencies on the old file system code.
2019-11-01 18:25:42 +00:00
#include "m_argv.h"
#include "gamecontrol.h"
- store palettes in the palette container.
2020-04-12 05:50:24 +00:00
#include "palettecontainer.h"
- consolidated the 'music' parsing in Defs (pending a refactor of the MAPINFO system.) - removed the remaining parts of the game Defs parser because we do not want anything EDuke in here.
2020-06-23 22:40:22 +00:00
#include "mapinfo.h"
- link hires replacements to textures instead of tile numbers. This is needed to connect them to fonts as well because its glyphs have no tile index.
2020-11-10 19:12:46 +00:00
int tileSetHightileReplacement(int picnum, int palnum, const char* filename, float alphacut, float xscale, float yscale, float specpower, float specfactor, uint8_t flags);
int tileSetSkybox(int picnum, int palnum, const char** facenames, int flags);
void tileRemoveReplacement(int num);
- redid scriptfile as a wrapper around FScanner Another piece of Build licensed code gone, yay! This will also allow gradual conversion of the DEF parser to our own code, unencumbered by the Build license. :)
2020-09-14 22:11:08 +00:00
int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens)
{
int32_t i;
if (!sf) return T_ERROR;
if (!sf->GetString()) return T_EOF;
for (i=ntokens-1; i>=0; i--)
{
if (sf->Compare(tl[i].text))
return tl[i].tokenid;
}
return T_ERROR;
}
- rewrote the map hack parser using sc_man. This unexpectedly turned out a complete rewrite so now it is under my own license. Also moved the remaining parts of map hack loading into the engine. Overall I have to say that the feature is not what I expected, it's merely used to fudge the positioning of model sprites and for adding Polymer lights.
2020-09-13 11:01:44 +00:00
void AddUserMapHack(usermaphack_t&);
- consolidated the 'music' parsing in Defs (pending a refactor of the MAPINFO system.) - removed the remaining parts of the game Defs parser because we do not want anything EDuke in here.
2020-06-23 22:40:22 +00:00
#if 0
// For later
{
if (sc.Compare("music"))
{
FString id, mus;
sc.MustGetToken('{');
while (!sc.CheckToken('}'))
{
sc.MustGetToken(TK_Identifier);
if (sc.Compare("id"))
{
sc.MustGetString();
id = sc.String;
}
else if (sc.Compare("file"))
{
sc.MustGetString();
mus = sc.String;
}
}
if (!SetMusicForMap(id, mus, true))
{
sc.ScriptError("Map %s not found in music definition", id.GetChars());
}
char* tokenPtr = pScript->ltextptr;
char* musicID = NULL;
char* fileName = NULL;
char* musicEnd;
if (scriptfile_getbraces(pScript, &musicEnd))
break;
while (pScript->textptr < musicEnd)
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(pScript, soundTokens, countof(soundTokens)))
- consolidated the 'music' parsing in Defs (pending a refactor of the MAPINFO system.) - removed the remaining parts of the game Defs parser because we do not want anything EDuke in here.
2020-06-23 22:40:22 +00:00
{
case T_ID: scriptfile_getstring(pScript, &musicID); break;
case T_FILE: scriptfile_getstring(pScript, &fileName); break;
}
}
if (!firstPass)
{
if (musicID == NULL)
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "missing ID for music definition\n");
- consolidated the 'music' parsing in Defs (pending a refactor of the MAPINFO system.) - removed the remaining parts of the game Defs parser because we do not want anything EDuke in here.
2020-06-23 22:40:22 +00:00
break;
}
if (fileName == NULL || fileSystem.FileExists(fileName))
break;
if (S_DefineMusic(musicID, fileName) == -1)
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "invalid music ID");
- consolidated the 'music' parsing in Defs (pending a refactor of the MAPINFO system.) - removed the remaining parts of the game Defs parser because we do not want anything EDuke in here.
2020-06-23 22:40:22 +00:00
}
}
}
#endif
Importing source for great justice git-svn-id: https://svn.eduke32.com/eduke32@5 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-13 20:47:06 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
enum scripttoken_t
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
T_INCLUDE = 0,
T_DEFINE,
T_DEFINETEXTURE,
T_DEFINESKYBOX,
T_DEFINETINT,
T_DEFINEMODEL,
T_DEFINEMODELFRAME,
T_DEFINEMODELANIM,
T_DEFINEMODELSKIN,
T_SELECTMODELSKIN,
T_DEFINEVOXEL,
T_DEFINEVOXELTILES,
T_MODEL,
T_FILE,
T_SCALE,
T_SHADE,
T_FRAME,
smoothduration def token for model frame definitions (defaults at 0) git-svn-id: https://svn.eduke32.com/eduke32@531 1a8010ca-5511-0410-912e-c29ae57300e0
2007-04-12 03:09:41 +00:00
T_SMOOTHDURATION,
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
T_ANIM,
T_SKIN,
T_SURF,
T_TILE,
T_TILE0,
T_TILE1,
T_FRAME0,
T_FRAME1,
T_FPS,
T_FLAGS,
T_PAL,
Hook basepal up to highpal. git-svn-id: https://svn.eduke32.com/eduke32@1782 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-27 07:05:12 +00:00
T_BASEPAL,
Detail mapping : r_detailmapping. git-svn-id: https://svn.eduke32.com/eduke32@459 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-15 09:08:57 +00:00
T_DETAIL,
Glow mapping ! git-svn-id: https://svn.eduke32.com/eduke32@497 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-15 01:35:34 +00:00
T_GLOW,
Modified priority system to use 6 priority levels instead of 3, added proper def syntax "specular" and "normal" which work identically to "detail" and "glow" for defining normals and specular maps (defining these with pals 100 and 101 will no longer work) git-svn-id: https://svn.eduke32.com/eduke32@1350 1a8010ca-5511-0410-912e-c29ae57300e0
2009-04-28 22:56:43 +00:00
T_SPECULAR,
T_NORMAL,
Various fixes and detail texturing on models. git-svn-id: https://svn.eduke32.com/eduke32@501 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 01:34:41 +00:00
T_PARAM,
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
T_HUD,
T_XADD,
T_YADD,
T_ZADD,
T_ANGADD,
Add custom FOV support for HUD model definitions with the 'fov' DEF token (in build angles). Also adds an r_pr_overridehud cvar in order to preview DEF token changes in-game using the r_pr_hud* cvars. git-svn-id: https://svn.eduke32.com/eduke32@1814 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-01 05:52:33 +00:00
T_FOV,
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
T_FLIPPED,
T_HIDE,
T_NOBOB,
T_NODEPTH,
T_VOXEL,
T_SKYBOX,
T_FRONT,T_RIGHT,T_BACK,T_LEFT,T_TOP,T_BOTTOM,
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
T_HIGHPALOOKUP,
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
T_TINT,
T_MAKEPALOOKUP, T_REMAPPAL, T_REMAPSELF,
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
T_NOFLOORPAL, T_FLOORPAL,
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
T_RED,T_GREEN,T_BLUE,
Adds specpower and specfactor definition tokens for textures. git-svn-id: https://svn.eduke32.com/eduke32@1278 1a8010ca-5511-0410-912e-c29ae57300e0
2009-03-28 12:14:37 +00:00
T_TEXTURE,T_ALPHACUT,T_XSCALE,T_YSCALE,T_SPECPOWER,T_SPECFACTOR,T_NOCOMPRESS,T_NODOWNSIZE,
Defs: Add token "forcefilter" to textures, skyboxes, and model skins. It forces the use of GL filtering for the resource in question. git-svn-id: https://svn.eduke32.com/eduke32@5108 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-28 09:49:37 +00:00
T_FORCEFILTER,
Defs: Add "artquality" subtoken to textures, model skins, and skyboxes, which grants the texture HICR_ARTIMMUNITY. In effect, this implies "nodownsize" and signals that texture compression would be undesirable, but okay using r_texcompr mode 2 (aggressive). git-svn-id: https://svn.eduke32.com/eduke32@5705 1a8010ca-5511-0410-912e-c29ae57300e0
2016-05-02 18:29:35 +00:00
T_ARTQUALITY,
Add support for "orig_sizex" and "orig_sizey" parameters to "texture" block in def files. This is the same as using "dummytile" before defining a texture. Needed for compatibility with the .def files from Megaton, not because I like arbitrarily adding extranneous shit. :p git-svn-id: https://svn.eduke32.com/eduke32@4062 1a8010ca-5511-0410-912e-c29ae57300e0
2013-09-14 17:58:46 +00:00
T_ORIGSIZEX,T_ORIGSIZEY,
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
T_UNDEFMODEL,T_UNDEFMODELRANGE,T_UNDEFMODELOF,T_UNDEFTEXTURE,T_UNDEFTEXTURERANGE,
T_ALPHAHACK,T_ALPHAHACKRANGE,
Mapster32: introduce DEF command "2dcolidxrange <col> <idx> <idxend>". <col> is the editorcolor[] starting index <idx> is the actual color index start <idxend> is the actual color index end So, editor colors from <col> onward will be mapped to [<idx> .. min(<idxend>, 255)]. Takes precedence over '2dcol'. git-svn-id: https://svn.eduke32.com/eduke32@5427 1a8010ca-5511-0410-912e-c29ae57300e0
2015-11-14 23:40:57 +00:00
T_SPRITECOL,T_2DCOL,T_2DCOLIDXRANGE,
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
T_FOGPAL,
T_LOADGRP,
def file control over shading harshness git-svn-id: https://svn.eduke32.com/eduke32@224 1a8010ca-5511-0410-912e-c29ae57300e0
2006-07-20 01:50:56 +00:00
T_DUMMYTILE,T_DUMMYTILERANGE,
Patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@665 1a8010ca-5511-0410-912e-c29ae57300e0
2008-03-27 21:32:23 +00:00
T_SETUPTILE,T_SETUPTILERANGE,
Defs: Add "undefinetile" and "undefinetilerange". git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:52:28 +00:00
T_UNDEFINETILE,T_UNDEFINETILERANGE,
Added a DEF command: animtilerange <tile1> <tile2> <speed> <type>. Note: it must be used with dummytiles. git-svn-id: https://svn.eduke32.com/eduke32@928 1a8010ca-5511-0410-912e-c29ae57300e0
2008-08-02 13:00:41 +00:00
T_ANIMTILERANGE,
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
T_CACHESIZE,
git-svn-id: https://svn.eduke32.com/eduke32@1150 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 09:22:07 +00:00
T_IMPORTTILE,
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
T_MUSIC,T_ID,T_SOUND,
Expose per-tile nofullbright bit (GL modes only) to DEF. The attribute is set per tile from DEF: either nofullbrightrange <begintile> <endtile> or tilefromtexture <tile> { ... nofullbright ... } As a special case, the list may only contain "nofullbright", in which case the texture is not changed. (This is analogous to "texhitscan".) Example: // make piggy's eyes fullbright red only when it fires the shotgun nofullbrightrange 2000 2034 nofullbrightrange 2040 2049 nofullbrightrange 2055 2061 git-svn-id: https://svn.eduke32.com/eduke32@3230 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-25 13:19:06 +00:00
T_TILEFROMTEXTURE, T_XOFFSET, T_YOFFSET, T_TEXHITSCAN, T_NOFULLBRIGHT,
Defs: Add "artfile" token, which loads an ART file. You can use the "tile" sub-token to overwrite the starting tilenum of the file from def. artfile { file "whatever.art" } // loads whatever.art just as if it had been named TILES020.ART artfile { file "whatever.art" tile 2000 } // loads whatever.art starting at index 2000 instead of the tilestart value contained within it This is useful because ART files will load faster than images loaded through tilefromtexture (which must undergo a color matching process), and because tiles making use of palette indices which have duplicate colors in the stock Duke 3D palette but not in other palettes (such as the 3D Realms screen) are negatively affected by the aforementioned process. git-svn-id: https://svn.eduke32.com/eduke32@5180 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:35 +00:00
T_ARTFILE,
Possibility of specifying sounds for a VPX anim-replacement via DEF. The syntax is as follows: animsounds <anim> { frame1 sound1 frame2 sound2 ... } <anim> has to be one of the tokens: cineov2, cineov3, RADLOGO, DUKETEAM, logo, vol41a, vol42a, vol4e1, vol43a, vol4e2, or vol4e3, corresponding to hard-coded Duke3D anims. The frameN's (1-based frame numbers) have to be in ascending order (but not necessarily strictly ascending, so that a frame may have more than one sound). Example: for Duke3D's XBLA nuke logo animation (IVF extracted from nuke.webm), the following definition overlays the video with a sound sequence similar (identical save for timing) to the original nuke animation: // frame 1: FLY_BY, frame 64: PIPEBOMB_EXPLODE animsounds logo { 1 244 64 14 } git-svn-id: https://svn.eduke32.com/eduke32@2242 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-10 23:43:54 +00:00
T_INCLUDEDEFAULT,
T_ANIMSOUNDS,
Animation system overhaul part 1. This allows for an unlimited number of .anm/.ivf files to be defined via duke3d.def and played back at any time with the new CON commands. Syntax is currently as follows, but may change: cutscene "somefile.anm" { delay 10 } // defines somefile.anm with a delay of 10 120Hz tics between frames. a more typical framerate method may come later, but this is how the originals worked. Once defined, they can be played through CON with the new playback command, also called "cutscene". It works like this: definequote 12345 somefile.anm define ANIM_SOMEFILE 12345 ... cutscene ANIM_SOMEFILE // halts game execution and immediately plays cutscene, resuming execution when finished ... Sounds can be played during animations (and tiles can be overlaid, etc) like this: onevent EVENT_CUTSCENE ifcutscene ANIM_SOMEFILE { ifvare RETURN 12 // frame 12 sound FLY_BY rotatesprite ... } endevent The value of the RETURN var at the end of EVENT_CUTSCENE determines the next frame to play. This can be used for looping, etc. Attempting to play animations backwards outright is not advised as animations only seek in one direction (so rewinding requires running it through from frame 0 again). This is will WIP and hasn't been heavily tested at all, so please try it out. git-svn-id: https://svn.eduke32.com/eduke32@4987 1a8010ca-5511-0410-912e-c29ae57300e0
2015-02-11 05:22:07 +00:00
T_CUTSCENE,
Add dummy parsing of "nofloorpalrange" to defs.c. git-svn-id: https://svn.eduke32.com/eduke32@2587 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:57:58 +00:00
T_NOFLOORPALRANGE,
Texel-granular hitscan() for wall-aligned sprites. The attribute is set per tile from DEF: either texhitscanrange <begintile> <endtile> or tilefromtexture <tile> { ... texhitscan ... } (As a special case, the list may only contain "texhitscan", in which case the texture is not changed.) In passing, do some cleanup for "tilefromtexture" DEF parsing: the list tokens should now be accepted in any order, and errors don't appear in the middle of the list parsing. git-svn-id: https://svn.eduke32.com/eduke32@3078 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-14 20:41:34 +00:00
T_TEXHITSCANRANGE,
Expose per-tile nofullbright bit (GL modes only) to DEF. The attribute is set per tile from DEF: either nofullbrightrange <begintile> <endtile> or tilefromtexture <tile> { ... nofullbright ... } As a special case, the list may only contain "nofullbright", in which case the texture is not changed. (This is analogous to "texhitscan".) Example: // make piggy's eyes fullbright red only when it fires the shotgun nofullbrightrange 2000 2034 nofullbrightrange 2040 2049 nofullbrightrange 2055 2061 git-svn-id: https://svn.eduke32.com/eduke32@3230 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-25 13:19:06 +00:00
T_NOFULLBRIGHTRANGE,
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
T_MAPINFO, T_MAPFILE, T_MAPTITLE, T_MAPMD4, T_MHKFILE,
Add "echo" def parameter which prints a string to the console and log file. Syntax: echo "Your text here." git-svn-id: https://svn.eduke32.com/eduke32@2435 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-10 09:44:17 +00:00
T_ECHO,
Add "globalflags" def token. Flag 1 is a kill switch for the tileshades and artmapping features. Flag 2 is kill switch for the GL fullbright rendering pass. git-svn-id: https://svn.eduke32.com/eduke32@5056 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-09 20:32:36 +00:00
T_GLOBALFLAGS,
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
T_COPYTILE,
Add game-side def "globalgameflags" that takes a single value. Flag 1 disables hardcoded pinning of HUD weapons to the side of the screen in widescreen. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@5161 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-24 00:08:46 +00:00
T_GLOBALGAMEFLAGS,
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
T_MULTIPSKY, T_HORIZFRAC, T_LOGNUMTILES,
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
T_BASEPALETTE, T_PALOOKUP, T_BLENDTABLE,
T_RAW, T_OFFSET, T_SHIFTLEFT, T_NOSHADES, T_COPY,
Defs: Add "numalphatables" token, which serves the same purpose as the lognumalphatabs byte in PALETTE.DAT. git-svn-id: https://svn.eduke32.com/eduke32@5366 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-27 21:18:24 +00:00
T_NUMALPHATABS,
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
T_UNDEF,
T_UNDEFBASEPALETTERANGE, T_UNDEFPALOOKUPRANGE, T_UNDEFBLENDTABLERANGE,
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
T_GLBLEND, T_FORWARD, T_REVERSE, T_BOTH, T_SRC, T_DST, T_ALPHA,
T_ZERO, T_ONE,
T_SRC_COLOR, T_ONE_MINUS_SRC_COLOR,
T_SRC_ALPHA, T_ONE_MINUS_SRC_ALPHA,
T_DST_ALPHA, T_ONE_MINUS_DST_ALPHA,
T_DST_COLOR, T_ONE_MINUS_DST_COLOR,
New def tokens for "tint": "shadered" or "sr", "shadeblue" or "sb", "shadegreen" or "sg" tint { pal <pal> shadered <0-255> shadegreen <0-255> shadeblue <0-255> } Make shade apply a tint based on the RGB. Default values for shade are zero (black). Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6557 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:58 +00:00
T_SHADERED, T_SHADEGREEN, T_SHADEBLUE,
New def token "shadefactor" shadefactor <value> Controls the level of shading in GL modes. Normally it is set to the shade at which all colors are pitch black. The default value calculated from Duke 3D's palette is 30, but most other Build games with a different palette are calculate to 31. This token is for GL mods without a palette. Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6592 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-26 04:35:15 +00:00
T_SHADEFACTOR,
Defs: Add tilefromtexture subtoken "ifmatch", with subtokens "crc32" and "size" git-svn-id: https://svn.eduke32.com/eduke32@8465 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/include/build.h # source/build/src/defs.cpp # source/build/src/tiles.cpp
2019-12-22 10:19:59 +00:00
T_IFCRC,T_IFMATCH,T_CRC32,
T_SIZE,
newgamechoices git-svn-id: https://svn.eduke32.com/eduke32@7930 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/src/defs.cpp
2019-08-09 08:21:19 +00:00
T_NEWGAMECHOICES,
Implement rotate parameter for voxel definitions # Conflicts: # source/build/include/build.h # source/build/include/mdsprite.h # source/build/src/defs.cpp
2019-09-17 05:07:28 +00:00
T_RFFDEFINEID,
T_EXTRA,
T_ROTATE,
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
T_SURFACE, T_VIEW,
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
};
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
static int32_t lastmodelid = -1, lastvoxid = -1, modelskin = -1, lastmodelskin = -1, seenframe = 0;
Re-use temporary buffer for tilefromtexture true color -> paletted conversion and free when finished with the .def instead of freeing and re-allocating for every tile git-svn-id: https://svn.eduke32.com/eduke32@4637 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:17:53 +00:00
static char *faketilebuffer = NULL;
static int32_t faketilebuffersiz = 0;
Importing source for great justice git-svn-id: https://svn.eduke32.com/eduke32@5 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-13 20:47:06 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
static const char *skyfaces[6] =
{
"front face", "right face", "back face",
"left face", "top face", "bottom face"
};
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
My first commit! The main feature is the addition of -mx and -mh command-line parameters to EDuke32 and Mapster32. These parameters include a con and def "module" respectively. This translates into essentially including the file from the bottom of the compiled script. I fixed the classic buggy behavior of the BROKEHYDROPLANT and REACTOR2 sprites. I also fixed a small, long-standing bug where FRAMEEFFECT1 blurs are not affected by sector floorpal. You can see one example of this by shrinking the Enforcer on the upper inside of the toppled building in E3L11: Freeway. I tweaked the Makefile so that it would automatically regenerate the keep.me files in the $(OBJ) and $(EOBJ) directories after they are deleted for cleaning. One final change is a slight positioning cleanup of both programs' --help dialog boxes. git-svn-id: https://svn.eduke32.com/eduke32@1937 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-21 22:39:29 +00:00
static int32_t defsparser(scriptfile *script);
- redid scriptfile as a wrapper around FScanner Another piece of Build licensed code gone, yay! This will also allow gradual conversion of the DEF parser to our own code, unencumbered by the Build license. :)
2020-09-14 22:11:08 +00:00
static void defsparser_include(const char *fn, scriptfile *script, FScriptPosition *pos)
My first commit! The main feature is the addition of -mx and -mh command-line parameters to EDuke32 and Mapster32. These parameters include a con and def "module" respectively. This translates into essentially including the file from the bottom of the compiled script. I fixed the classic buggy behavior of the BROKEHYDROPLANT and REACTOR2 sprites. I also fixed a small, long-standing bug where FRAMEEFFECT1 blurs are not affected by sector floorpal. You can see one example of this by shrinking the Enforcer on the upper inside of the toppled building in E3L11: Freeway. I tweaked the Makefile so that it would automatically regenerate the keep.me files in the $(OBJ) and $(EOBJ) directories after they are deleted for cleaning. One final change is a slight positioning cleanup of both programs' --help dialog boxes. git-svn-id: https://svn.eduke32.com/eduke32@1937 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-21 22:39:29 +00:00
{
scriptfile *included;
included = scriptfile_fromfile(fn);
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (!included)
My first commit! The main feature is the addition of -mx and -mh command-line parameters to EDuke32 and Mapster32. These parameters include a con and def "module" respectively. This translates into essentially including the file from the bottom of the compiled script. I fixed the classic buggy behavior of the BROKEHYDROPLANT and REACTOR2 sprites. I also fixed a small, long-standing bug where FRAMEEFFECT1 blurs are not affected by sector floorpal. You can see one example of this by shrinking the Enforcer on the upper inside of the toppled building in E3L11: Freeway. I tweaked the Makefile so that it would automatically regenerate the keep.me files in the $(OBJ) and $(EOBJ) directories after they are deleted for cleaning. One final change is a slight positioning cleanup of both programs' --help dialog boxes. git-svn-id: https://svn.eduke32.com/eduke32@1937 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-21 22:39:29 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (!pos)
- use Printf as the only command to print to the console. All uses of OSD_Printf, initprintf etc. have been renamed.
2020-04-11 21:45:45 +00:00
Printf("Warning: Failed including %s as module\n", fn);
My first commit! The main feature is the addition of -mx and -mh command-line parameters to EDuke32 and Mapster32. These parameters include a con and def "module" respectively. This translates into essentially including the file from the bottom of the compiled script. I fixed the classic buggy behavior of the BROKEHYDROPLANT and REACTOR2 sprites. I also fixed a small, long-standing bug where FRAMEEFFECT1 blurs are not affected by sector floorpal. You can see one example of this by shrinking the Enforcer on the upper inside of the toppled building in E3L11: Freeway. I tweaked the Makefile so that it would automatically regenerate the keep.me files in the $(OBJ) and $(EOBJ) directories after they are deleted for cleaning. One final change is a slight positioning cleanup of both programs' --help dialog boxes. git-svn-id: https://svn.eduke32.com/eduke32@1937 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-21 22:39:29 +00:00
else
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos->Message(MSG_ERROR, "Failed including %s", fn);
My first commit! The main feature is the addition of -mx and -mh command-line parameters to EDuke32 and Mapster32. These parameters include a con and def "module" respectively. This translates into essentially including the file from the bottom of the compiled script. I fixed the classic buggy behavior of the BROKEHYDROPLANT and REACTOR2 sprites. I also fixed a small, long-standing bug where FRAMEEFFECT1 blurs are not affected by sector floorpal. You can see one example of this by shrinking the Enforcer on the upper inside of the toppled building in E3L11: Freeway. I tweaked the Makefile so that it would automatically regenerate the keep.me files in the $(OBJ) and $(EOBJ) directories after they are deleted for cleaning. One final change is a slight positioning cleanup of both programs' --help dialog boxes. git-svn-id: https://svn.eduke32.com/eduke32@1937 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-21 22:39:29 +00:00
}
else
{
- redid scriptfile as a wrapper around FScanner Another piece of Build licensed code gone, yay! This will also allow gradual conversion of the DEF parser to our own code, unencumbered by the Build license. :)
2020-09-14 22:11:08 +00:00
if (script) included->symbols = std::move(script->symbols);
My first commit! The main feature is the addition of -mx and -mh command-line parameters to EDuke32 and Mapster32. These parameters include a con and def "module" respectively. This translates into essentially including the file from the bottom of the compiled script. I fixed the classic buggy behavior of the BROKEHYDROPLANT and REACTOR2 sprites. I also fixed a small, long-standing bug where FRAMEEFFECT1 blurs are not affected by sector floorpal. You can see one example of this by shrinking the Enforcer on the upper inside of the toppled building in E3L11: Freeway. I tweaked the Makefile so that it would automatically regenerate the keep.me files in the $(OBJ) and $(EOBJ) directories after they are deleted for cleaning. One final change is a slight positioning cleanup of both programs' --help dialog boxes. git-svn-id: https://svn.eduke32.com/eduke32@1937 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-21 22:39:29 +00:00
defsparser(included);
- redid scriptfile as a wrapper around FScanner Another piece of Build licensed code gone, yay! This will also allow gradual conversion of the DEF parser to our own code, unencumbered by the Build license. :)
2020-09-14 22:11:08 +00:00
if (script) script->symbols = std::move(included->symbols);
My first commit! The main feature is the addition of -mx and -mh command-line parameters to EDuke32 and Mapster32. These parameters include a con and def "module" respectively. This translates into essentially including the file from the bottom of the compiled script. I fixed the classic buggy behavior of the BROKEHYDROPLANT and REACTOR2 sprites. I also fixed a small, long-standing bug where FRAMEEFFECT1 blurs are not affected by sector floorpal. You can see one example of this by shrinking the Enforcer on the upper inside of the toppled building in E3L11: Freeway. I tweaked the Makefile so that it would automatically regenerate the keep.me files in the $(OBJ) and $(EOBJ) directories after they are deleted for cleaning. One final change is a slight positioning cleanup of both programs' --help dialog boxes. git-svn-id: https://svn.eduke32.com/eduke32@1937 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-21 22:39:29 +00:00
scriptfile_close(included);
}
}
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
static int32_t check_tile_range(const char *defcmd, int32_t *tilebeg, int32_t *tileend,
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
const scriptfile *script, FScriptPosition pos)
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
{
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (*tileend < *tilebeg)
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_WARNING, "%s: backwards tile range", defcmd);
- replaced swapptr with std::swap.
2020-09-10 14:36:31 +00:00
std::swap(*tilebeg, *tileend);
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)*tilebeg >= MAXUSERTILES || (unsigned)*tileend >= MAXUSERTILES)
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "%s: Invalid tile range", defcmd);
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
return 1;
}
return 0;
}
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
static int32_t check_tile(const char *defcmd, int32_t tile, const scriptfile *script, FScriptPosition pos)
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
{
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)tile >= MAXUSERTILES)
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "%s: Invalid tile number", defcmd);
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
return 1;
}
return 0;
}
Compile DEF progress meter only on Windows or if having the startup window. The latter checked with #defined HAVE_GTK2, which is probably not correct for every platform. In builds without a startup window, the periods get mingled with stdout output otherwise. git-svn-id: https://svn.eduke32.com/eduke32@3827 1a8010ca-5511-0410-912e-c29ae57300e0
2013-05-30 18:10:50 +00:00
#undef USE_DEF_PROGRESS
#if defined _WIN32 || defined HAVE_GTK2
# define USE_DEF_PROGRESS
#endif
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
static int32_t defsparser(scriptfile *script)
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
{
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t tokn;
Compile DEF progress meter only on Windows or if having the startup window. The latter checked with #defined HAVE_GTK2, which is probably not correct for every platform. In builds without a startup window, the periods get mingled with stdout output otherwise. git-svn-id: https://svn.eduke32.com/eduke32@3827 1a8010ca-5511-0410-912e-c29ae57300e0
2013-05-30 18:10:50 +00:00
#ifdef USE_DEF_PROGRESS
Add a simple indicator of progress when loading a large def (like the HRP)... print one period to the startup window per 50 passes of the main loop in defsparser() git-svn-id: https://svn.eduke32.com/eduke32@3801 1a8010ca-5511-0410-912e-c29ae57300e0
2013-05-23 18:27:24 +00:00
static uint32_t iter = 0;
Compile DEF progress meter only on Windows or if having the startup window. The latter checked with #defined HAVE_GTK2, which is probably not correct for every platform. In builds without a startup window, the periods get mingled with stdout output otherwise. git-svn-id: https://svn.eduke32.com/eduke32@3827 1a8010ca-5511-0410-912e-c29ae57300e0
2013-05-30 18:10:50 +00:00
#endif
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist basetokens[] =
{
{ "include", T_INCLUDE },
{ "#include", T_INCLUDE },
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;) "The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used." git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
{ "includedefault", T_INCLUDEDEFAULT },
{ "#includedefault", T_INCLUDEDEFAULT },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
{ "define", T_DEFINE },
{ "#define", T_DEFINE },
// deprecated style
{ "definetexture", T_DEFINETEXTURE },
{ "defineskybox", T_DEFINESKYBOX },
{ "definetint", T_DEFINETINT },
{ "definemodel", T_DEFINEMODEL },
{ "definemodelframe",T_DEFINEMODELFRAME },
{ "definemodelanim", T_DEFINEMODELANIM },
{ "definemodelskin", T_DEFINEMODELSKIN },
{ "selectmodelskin", T_SELECTMODELSKIN },
{ "definevoxel", T_DEFINEVOXEL },
{ "definevoxeltiles",T_DEFINEVOXELTILES },
// new style
{ "model", T_MODEL },
{ "voxel", T_VOXEL },
{ "skybox", T_SKYBOX },
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
{ "highpalookup", T_HIGHPALOOKUP },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
{ "tint", T_TINT },
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
{ "makepalookup", T_MAKEPALOOKUP },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
{ "texture", T_TEXTURE },
{ "tile", T_TEXTURE },
{ "music", T_MUSIC },
{ "sound", T_SOUND },
Possibility of specifying sounds for a VPX anim-replacement via DEF. The syntax is as follows: animsounds <anim> { frame1 sound1 frame2 sound2 ... } <anim> has to be one of the tokens: cineov2, cineov3, RADLOGO, DUKETEAM, logo, vol41a, vol42a, vol4e1, vol43a, vol4e2, or vol4e3, corresponding to hard-coded Duke3D anims. The frameN's (1-based frame numbers) have to be in ascending order (but not necessarily strictly ascending, so that a frame may have more than one sound). Example: for Duke3D's XBLA nuke logo animation (IVF extracted from nuke.webm), the following definition overlays the video with a sound sequence similar (identical save for timing) to the original nuke animation: // frame 1: FLY_BY, frame 64: PIPEBOMB_EXPLODE animsounds logo { 1 244 64 14 } git-svn-id: https://svn.eduke32.com/eduke32@2242 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-10 23:43:54 +00:00
{ "animsounds", T_ANIMSOUNDS }, // dummy
Animation system overhaul part 1. This allows for an unlimited number of .anm/.ivf files to be defined via duke3d.def and played back at any time with the new CON commands. Syntax is currently as follows, but may change: cutscene "somefile.anm" { delay 10 } // defines somefile.anm with a delay of 10 120Hz tics between frames. a more typical framerate method may come later, but this is how the originals worked. Once defined, they can be played through CON with the new playback command, also called "cutscene". It works like this: definequote 12345 somefile.anm define ANIM_SOMEFILE 12345 ... cutscene ANIM_SOMEFILE // halts game execution and immediately plays cutscene, resuming execution when finished ... Sounds can be played during animations (and tiles can be overlaid, etc) like this: onevent EVENT_CUTSCENE ifcutscene ANIM_SOMEFILE { ifvare RETURN 12 // frame 12 sound FLY_BY rotatesprite ... } endevent The value of the RETURN var at the end of EVENT_CUTSCENE determines the next frame to play. This can be used for looping, etc. Attempting to play animations backwards outright is not advised as animations only seek in one direction (so rewinding requires running it through from frame 0 again). This is will WIP and hasn't been heavily tested at all, so please try it out. git-svn-id: https://svn.eduke32.com/eduke32@4987 1a8010ca-5511-0410-912e-c29ae57300e0
2015-02-11 05:22:07 +00:00
{ "cutscene", T_CUTSCENE },
Move g_noFloorPal[] to the engine side and adapt other stuff accordingly. - 'nofloorpalrange' DEF token: now handled for both game and editor (for the latter, it's effective only for "shade preview" mode, [']+[X]). - in generatefogpals(), assign g_noFloorPal[] = 1 for every generated (default) fog pal; get rid of its return value / g_firstFogPal git-svn-id: https://svn.eduke32.com/eduke32@4811 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:04 +00:00
{ "nofloorpalrange", T_NOFLOORPALRANGE },
Texel-granular hitscan() for wall-aligned sprites. The attribute is set per tile from DEF: either texhitscanrange <begintile> <endtile> or tilefromtexture <tile> { ... texhitscan ... } (As a special case, the list may only contain "texhitscan", in which case the texture is not changed.) In passing, do some cleanup for "tilefromtexture" DEF parsing: the list tokens should now be accepted in any order, and errors don't appear in the middle of the list parsing. git-svn-id: https://svn.eduke32.com/eduke32@3078 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-14 20:41:34 +00:00
{ "texhitscanrange", T_TEXHITSCANRANGE },
Expose per-tile nofullbright bit (GL modes only) to DEF. The attribute is set per tile from DEF: either nofullbrightrange <begintile> <endtile> or tilefromtexture <tile> { ... nofullbright ... } As a special case, the list may only contain "nofullbright", in which case the texture is not changed. (This is analogous to "texhitscan".) Example: // make piggy's eyes fullbright red only when it fires the shotgun nofullbrightrange 2000 2034 nofullbrightrange 2040 2049 nofullbrightrange 2055 2061 git-svn-id: https://svn.eduke32.com/eduke32@3230 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-25 13:19:06 +00:00
{ "nofullbrightrange", T_NOFULLBRIGHTRANGE },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
// other stuff
{ "undefmodel", T_UNDEFMODEL },
{ "undefmodelrange", T_UNDEFMODELRANGE },
{ "undefmodelof", T_UNDEFMODELOF },
{ "undeftexture", T_UNDEFTEXTURE },
{ "undeftexturerange", T_UNDEFTEXTURERANGE },
{ "alphahack", T_ALPHAHACK },
{ "alphahackrange", T_ALPHAHACKRANGE },
{ "spritecol", T_SPRITECOL },
{ "2dcol", T_2DCOL },
Mapster32: introduce DEF command "2dcolidxrange <col> <idx> <idxend>". <col> is the editorcolor[] starting index <idx> is the actual color index start <idxend> is the actual color index end So, editor colors from <col> onward will be mapped to [<idx> .. min(<idxend>, 255)]. Takes precedence over '2dcol'. git-svn-id: https://svn.eduke32.com/eduke32@5427 1a8010ca-5511-0410-912e-c29ae57300e0
2015-11-14 23:40:57 +00:00
{ "2dcolidxrange", T_2DCOLIDXRANGE },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
{ "fogpal", T_FOGPAL },
{ "loadgrp", T_LOADGRP },
{ "dummytile", T_DUMMYTILE },
{ "dummytilerange", T_DUMMYTILERANGE },
{ "setuptile", T_SETUPTILE },
{ "setuptilerange", T_SETUPTILERANGE },
Defs: Add "undefinetile" and "undefinetilerange". git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:52:28 +00:00
{ "undefinetile", T_UNDEFINETILE },
Amend previous commit. git-svn-id: https://svn.eduke32.com/eduke32@5128 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:56:36 +00:00
{ "undefinetilerange", T_UNDEFINETILERANGE },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
{ "animtilerange", T_ANIMTILERANGE },
{ "cachesize", T_CACHESIZE },
{ "dummytilefrompic",T_IMPORTTILE },
{ "tilefromtexture", T_TILEFROMTEXTURE },
Defs: Add "artfile" token, which loads an ART file. You can use the "tile" sub-token to overwrite the starting tilenum of the file from def. artfile { file "whatever.art" } // loads whatever.art just as if it had been named TILES020.ART artfile { file "whatever.art" tile 2000 } // loads whatever.art starting at index 2000 instead of the tilestart value contained within it This is useful because ART files will load faster than images loaded through tilefromtexture (which must undergo a color matching process), and because tiles making use of palette indices which have duplicate colors in the stock Duke 3D palette but not in other palettes (such as the 3D Realms screen) are negatively affected by the aforementioned process. git-svn-id: https://svn.eduke32.com/eduke32@5180 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:35 +00:00
{ "artfile", T_ARTFILE },
Implement UserMapHacks. git-svn-id: https://svn.eduke32.com/eduke32@4884 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-08 15:14:00 +00:00
{ "mapinfo", T_MAPINFO },
Add "echo" def parameter which prints a string to the console and log file. Syntax: echo "Your text here." git-svn-id: https://svn.eduke32.com/eduke32@2435 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-10 09:44:17 +00:00
{ "echo", T_ECHO },
Add "globalflags" def token. Flag 1 is a kill switch for the tileshades and artmapping features. Flag 2 is kill switch for the GL fullbright rendering pass. git-svn-id: https://svn.eduke32.com/eduke32@5056 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-09 20:32:36 +00:00
{ "globalflags", T_GLOBALFLAGS },
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
{ "copytile", T_COPYTILE },
Add game-side def "globalgameflags" that takes a single value. Flag 1 disables hardcoded pinning of HUD weapons to the side of the screen in widescreen. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@5161 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-24 00:08:46 +00:00
{ "globalgameflags", T_GLOBALGAMEFLAGS }, // dummy
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
{ "multipsky", T_MULTIPSKY },
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{ "basepalette", T_BASEPALETTE },
{ "palookup", T_PALOOKUP },
{ "blendtable", T_BLENDTABLE },
Defs: Add "numalphatables" token, which serves the same purpose as the lognumalphatabs byte in PALETTE.DAT. git-svn-id: https://svn.eduke32.com/eduke32@5366 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-27 21:18:24 +00:00
{ "numalphatables", T_NUMALPHATABS },
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
{ "undefbasepaletterange", T_UNDEFBASEPALETTERANGE },
{ "undefpalookuprange", T_UNDEFPALOOKUPRANGE },
{ "undefblendtablerange", T_UNDEFBLENDTABLERANGE },
New def token "shadefactor" shadefactor <value> Controls the level of shading in GL modes. Normally it is set to the shade at which all colors are pitch black. The default value calculated from Duke 3D's palette is 30, but most other Build games with a different palette are calculate to 31. This token is for GL mods without a palette. Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6592 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-26 04:35:15 +00:00
{ "shadefactor", T_SHADEFACTOR },
newgamechoices git-svn-id: https://svn.eduke32.com/eduke32@7930 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/src/defs.cpp
2019-08-09 08:21:19 +00:00
{ "newgamechoices", T_NEWGAMECHOICES },
- Blood merge # Conflicts: # source/build/include/polymost.h # source/build/src/build.cpp # source/build/src/engine.cpp # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp
2019-09-19 20:02:45 +00:00
{ "rffdefineid", T_RFFDEFINEID }, // dummy
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
};
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
while (1)
{
Compile DEF progress meter only on Windows or if having the startup window. The latter checked with #defined HAVE_GTK2, which is probably not correct for every platform. In builds without a startup window, the periods get mingled with stdout output otherwise. git-svn-id: https://svn.eduke32.com/eduke32@3827 1a8010ca-5511-0410-912e-c29ae57300e0
2013-05-30 18:10:50 +00:00
#ifdef USE_DEF_PROGRESS
Add a simple indicator of progress when loading a large def (like the HRP)... print one period to the startup window per 50 passes of the main loop in defsparser() git-svn-id: https://svn.eduke32.com/eduke32@3801 1a8010ca-5511-0410-912e-c29ae57300e0
2013-05-23 18:27:24 +00:00
if (++iter >= 50)
{
- use Printf as the only command to print to the console. All uses of OSD_Printf, initprintf etc. have been renamed.
2020-04-11 21:45:45 +00:00
Printf(".");
Add a simple indicator of progress when loading a large def (like the HRP)... print one period to the startup window per 50 passes of the main loop in defsparser() git-svn-id: https://svn.eduke32.com/eduke32@3801 1a8010ca-5511-0410-912e-c29ae57300e0
2013-05-23 18:27:24 +00:00
iter = 0;
}
Compile DEF progress meter only on Windows or if having the startup window. The latter checked with #defined HAVE_GTK2, which is probably not correct for every platform. In builds without a startup window, the periods get mingled with stdout output otherwise. git-svn-id: https://svn.eduke32.com/eduke32@3827 1a8010ca-5511-0410-912e-c29ae57300e0
2013-05-30 18:10:50 +00:00
#endif
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
tokn = getatoken(script,basetokens,countof(basetokens));
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto pos = scriptfile_getposition(script);
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
switch (tokn)
{
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_ERROR:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "Unknown error");
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
break;
case T_EOF:
"return" is not a function. git-svn-id: https://svn.eduke32.com/eduke32@5803 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:34:41 +00:00
return 0;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_INCLUDE:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
if (!scriptfile_getstring(script,&fn))
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
defsparser_include(fn, script, &pos);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;) "The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used." git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
case T_INCLUDEDEFAULT:
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
defsparser_include(G_DefaultDefFile(), script, &pos);
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;) "The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used." git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
break;
}
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_DEFINE:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString name;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t number;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getstring(script,&name)) break;
if (scriptfile_getsymbol(script,&number)) break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
- redid scriptfile as a wrapper around FScanner Another piece of Build licensed code gone, yay! This will also allow gradual conversion of the DEF parser to our own code, unencumbered by the Build license. :)
2020-09-14 22:11:08 +00:00
if (scriptfile_addsymbolvalue(script, name,number) < 0)
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_WARNING, "Warning: Symbol %s was NOT redefined to %d", name.GetChars(),number);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
// OLD (DEPRECATED) DEFINITION SYNTAX
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_DEFINETEXTURE:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
int32_t tile,pal,fnoo;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getsymbol(script,&tile)) break;
if (scriptfile_getsymbol(script,&pal)) break;
if (scriptfile_getnumber(script,&fnoo)) break; //x-center
if (scriptfile_getnumber(script,&fnoo)) break; //y-center
if (scriptfile_getnumber(script,&fnoo)) break; //x-size
if (scriptfile_getnumber(script,&fnoo)) break; //y-size
if (scriptfile_getstring(script,&fn)) break;
- fixed bad file checks in defs parser.
2020-09-12 10:39:18 +00:00
if (!fileSystem.FileExists(fn))
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
break;
Check file availability before calling the hightile substitution functions git-svn-id: https://svn.eduke32.com/eduke32@326 1a8010ca-5511-0410-912e-c29ae57300e0
2006-10-31 18:32:29 +00:00
Moved hightile replacement data into the textures Not tested yet!
2019-10-17 10:45:25 +00:00
tileSetHightileReplacement(tile,pal,fn,-1.0,1.0,1.0,1.0,1.0,0);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_DEFINESKYBOX:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
int32_t tile,pal,i;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn[6];
int happy = 1;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getsymbol(script,&tile)) break;
if (scriptfile_getsymbol(script,&pal)) break;
if (scriptfile_getsymbol(script,&i)) break; //future expansion
new version of astyle git-svn-id: https://svn.eduke32.com/eduke32@1229 1a8010ca-5511-0410-912e-c29ae57300e0
2009-02-19 16:47:54 +00:00
for (i=0; i<6; i++)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getstring(script,&fn[i])) break; //grab the 6 faces
bleh git-svn-id: https://svn.eduke32.com/eduke32@544 1a8010ca-5511-0410-912e-c29ae57300e0
2007-05-01 04:35:27 +00:00
- fixed bad file checks in defs parser.
2020-09-12 10:39:18 +00:00
if (!fileSystem.FileExists(fn[i]))
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
happy = 0;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (i < 6 || !happy) break;
Moved hightile replacement data into the textures Not tested yet!
2019-10-17 10:45:25 +00:00
tileSetSkybox(tile, pal, (const char **)fn, 0);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_DEFINETINT:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
Fix the definetint def token, broken in r6557. git-svn-id: https://svn.eduke32.com/eduke32@6674 1a8010ca-5511-0410-912e-c29ae57300e0
2018-02-18 00:24:54 +00:00
int32_t pal, r,g,b,f;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getsymbol(script,&pal)) break;
if (scriptfile_getnumber(script,&r)) break;
if (scriptfile_getnumber(script,&g)) break;
if (scriptfile_getnumber(script,&b)) break;
if (scriptfile_getnumber(script,&f)) break; //effects
- moved hictinting data into the lookup tables.
2020-05-29 18:15:42 +00:00
lookups.setPaletteTint(pal,r,g,b,0,0,0,f);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_ALPHAHACK:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t tile;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
double alpha;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getsymbol(script,&tile)) break;
if (scriptfile_getdouble(script,&alpha)) break;
Clean up defs.c a little. - remove redundant bound checks - add necessary bound checks - make one comparison pair consistent (> vs. >=) - one if-if --> clamp git-svn-id: https://svn.eduke32.com/eduke32@2553 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:15 +00:00
if ((uint32_t)tile < MAXTILES)
- fixed bad file checks in defs parser.
2020-09-12 10:39:18 +00:00
TileFiles.tiledata[tile].texture->alphaThreshold = (float)alpha;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_ALPHAHACKRANGE:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
Fix warnings that appear if big-endian || USE_OPENGL=0. git-svn-id: https://svn.eduke32.com/eduke32@3382 1a8010ca-5511-0410-912e-c29ae57300e0
2013-01-08 06:17:10 +00:00
int32_t tilenume1,tilenume2;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
double alpha;
if (scriptfile_getsymbol(script,&tilenume1)) break;
if (scriptfile_getsymbol(script,&tilenume2)) break;
if (scriptfile_getdouble(script,&alpha)) break;
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile_range("alphahackrange", &tilenume1, &tilenume2, script, pos))
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
break;
- texture code cleanup, mainly cppying layer data into the textures at startup to be able to use a real material system.
2020-05-29 21:33:26 +00:00
for (int i=tilenume1; i<=tilenume2; i++)
- fixed bad file checks in defs parser.
2020-09-12 10:39:18 +00:00
TileFiles.tiledata[i].texture->alphaThreshold = (float)alpha;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_SPRITECOL:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t tile,col,col2;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getsymbol(script,&tile)) break;
if (scriptfile_getnumber(script,&col)) break;
if (scriptfile_getnumber(script,&col2)) break;
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_2DCOL:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t col,b,g,r;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getnumber(script,&col)) break;
if (scriptfile_getnumber(script,&r)) break;
if (scriptfile_getnumber(script,&g)) break;
if (scriptfile_getnumber(script,&b)) break;
Input validation: guard makepalookup 'pal', 2dcol 'col'. Add one const. git-svn-id: https://svn.eduke32.com/eduke32@2500 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-18 23:17:51 +00:00
if ((unsigned)col < 256)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Mapster32: introduce DEF command "2dcolidxrange <col> <idx> <idxend>". <col> is the editorcolor[] starting index <idx> is the actual color index start <idxend> is the actual color index end So, editor colors from <col> onward will be mapped to [<idx> .. min(<idxend>, 255)]. Takes precedence over '2dcol'. git-svn-id: https://svn.eduke32.com/eduke32@5427 1a8010ca-5511-0410-912e-c29ae57300e0
2015-11-14 23:40:57 +00:00
case T_2DCOLIDXRANGE: // NOTE: takes precedence over 2dcol, see InitCustomColors()
{
int32_t col, idx, idxend;
if (scriptfile_getnumber(script,&col)) break;
if (scriptfile_getnumber(script,&idx)) break;
if (scriptfile_getnumber(script,&idxend)) break;
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_FOGPAL:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
Make makepalookup() accept NULL for 'remapbuf', meaning "use identity mapping". Also, - use this in game.c and astub.c palookup loading code - when makepalookup() is passed a 0 palnum, return early. This means that 'fogpal' will silently fail when attempting to change pal 0. - in 'makepalookup' DEF command, error out if passed a pal of 0. git-svn-id: https://svn.eduke32.com/eduke32@2569 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:17:03 +00:00
int32_t p,r,g,b;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
Ensure that anywhere the def parser takes a tilenum or palnum accepts defined tokens in addition to integer literals, if it doesn't already. Affects fogpal, nofloorpalrange, setuptilerange, dummytilerange, undefinetilerange, definemodelframe, definevoxeltiles, texhitscanrange, nofullbrightrange, and light. git-svn-id: https://svn.eduke32.com/eduke32@6896 1a8010ca-5511-0410-912e-c29ae57300e0
2018-05-23 05:43:35 +00:00
if (scriptfile_getsymbol(script,&p)) break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getnumber(script,&r)) break;
if (scriptfile_getnumber(script,&g)) break;
if (scriptfile_getnumber(script,&b)) break;
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
r = clamp(r, 0, 63);
g = clamp(g, 0, 63);
b = clamp(b, 0, 63);
- palette code cleanup.
2020-05-27 20:19:02 +00:00
lookups.makeTable(p, NULL, r<<2, g<<2, b<<2, 1);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Move g_noFloorPal[] to the engine side and adapt other stuff accordingly. - 'nofloorpalrange' DEF token: now handled for both game and editor (for the latter, it's effective only for "shade preview" mode, [']+[X]). - in generatefogpals(), assign g_noFloorPal[] = 1 for every generated (default) fog pal; get rid of its return value / g_firstFogPal git-svn-id: https://svn.eduke32.com/eduke32@4811 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:04 +00:00
case T_NOFLOORPALRANGE:
{
int32_t b,e,i;
Ensure that anywhere the def parser takes a tilenum or palnum accepts defined tokens in addition to integer literals, if it doesn't already. Affects fogpal, nofloorpalrange, setuptilerange, dummytilerange, undefinetilerange, definemodelframe, definevoxeltiles, texhitscanrange, nofullbrightrange, and light. git-svn-id: https://svn.eduke32.com/eduke32@6896 1a8010ca-5511-0410-912e-c29ae57300e0
2018-05-23 05:43:35 +00:00
if (scriptfile_getsymbol(script,&b)) break;
if (scriptfile_getsymbol(script,&e)) break;
Move g_noFloorPal[] to the engine side and adapt other stuff accordingly. - 'nofloorpalrange' DEF token: now handled for both game and editor (for the latter, it's effective only for "shade preview" mode, [']+[X]). - in generatefogpals(), assign g_noFloorPal[] = 1 for every generated (default) fog pal; get rid of its return value / g_firstFogPal git-svn-id: https://svn.eduke32.com/eduke32@4811 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:04 +00:00
b = max(b, 1);
e = min(e, MAXPALOOKUPS-1);
- palette code cleanup.
2020-05-27 20:19:02 +00:00
for (i = b; i <= e; i++)
lookups.tables[i].noFloorPal = true;
Move g_noFloorPal[] to the engine side and adapt other stuff accordingly. - 'nofloorpalrange' DEF token: now handled for both game and editor (for the latter, it's effective only for "shade preview" mode, [']+[X]). - in generatefogpals(), assign g_noFloorPal[] = 1 for every generated (default) fog pal; get rid of its return value / g_firstFogPal git-svn-id: https://svn.eduke32.com/eduke32@4811 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:04 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_LOADGRP:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
scriptfile_getstring(script,nullptr);
- consolidated the 'music' parsing in Defs (pending a refactor of the MAPINFO system.) - removed the remaining parts of the game Defs parser because we do not want anything EDuke in here.
2020-06-23 22:40:22 +00:00
#if 0
if (!scriptfile_getstring(pScript, &fileName) && firstPass)
{
fileSystem.AddAdditionalFile(fileName);
}
#endif
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Mouse sensitivity stuff git-svn-id: https://svn.eduke32.com/eduke32@441 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-02 02:27:31 +00:00
case T_CACHESIZE:
{
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t j;
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
Mouse sensitivity stuff git-svn-id: https://svn.eduke32.com/eduke32@441 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-02 02:27:31 +00:00
if (scriptfile_getnumber(script,&j)) break;
}
break;
New def token "shadefactor" shadefactor <value> Controls the level of shading in GL modes. Normally it is set to the shade at which all colors are pitch black. The default value calculated from Duke 3D's palette is 30, but most other Build games with a different palette are calculate to 31. This token is for GL mods without a palette. Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6592 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-26 04:35:15 +00:00
case T_SHADEFACTOR:
- all base palette data has been transitioned to GPalette.
2020-04-12 05:51:11 +00:00
//scriptfile_getnumber(script, &realmaxshade);
//frealmaxshade = (float)realmaxshade;
New def token "shadefactor" shadefactor <value> Controls the level of shading in GL modes. Normally it is set to the shade at which all colors are pitch black. The default value calculated from Duke 3D's palette is 30, but most other Build games with a different palette are calculate to 31. This token is for GL mods without a palette. Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6592 1a8010ca-5511-0410-912e-c29ae57300e0
2018-01-26 04:35:15 +00:00
break;
Defs: Add "artfile" token, which loads an ART file. You can use the "tile" sub-token to overwrite the starting tilenum of the file from def. artfile { file "whatever.art" } // loads whatever.art just as if it had been named TILES020.ART artfile { file "whatever.art" tile 2000 } // loads whatever.art starting at index 2000 instead of the tilestart value contained within it This is useful because ART files will load faster than images loaded through tilefromtexture (which must undergo a color matching process), and because tiles making use of palette indices which have duplicate colors in the stock Duke 3D palette but not in other palettes (such as the 3D Realms screen) are negatively affected by the aforementioned process. git-svn-id: https://svn.eduke32.com/eduke32@5180 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:35 +00:00
case T_ARTFILE:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos blockend;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
Defs: Add "artfile" token, which loads an ART file. You can use the "tile" sub-token to overwrite the starting tilenum of the file from def. artfile { file "whatever.art" } // loads whatever.art just as if it had been named TILES020.ART artfile { file "whatever.art" tile 2000 } // loads whatever.art starting at index 2000 instead of the tilestart value contained within it This is useful because ART files will load faster than images loaded through tilefromtexture (which must undergo a color matching process), and because tiles making use of palette indices which have duplicate colors in the stock Duke 3D palette but not in other palettes (such as the 3D Realms screen) are negatively affected by the aforementioned process. git-svn-id: https://svn.eduke32.com/eduke32@5180 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:35 +00:00
int32_t tile = -1, havetile = 0;
static const tokenlist artfiletokens[] =
{
{ "file", T_FILE },
{ "tile", T_TILE },
};
if (scriptfile_getbraces(script,&blockend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, blockend))
Defs: Add "artfile" token, which loads an ART file. You can use the "tile" sub-token to overwrite the starting tilenum of the file from def. artfile { file "whatever.art" } // loads whatever.art just as if it had been named TILES020.ART artfile { file "whatever.art" tile 2000 } // loads whatever.art starting at index 2000 instead of the tilestart value contained within it This is useful because ART files will load faster than images loaded through tilefromtexture (which must undergo a color matching process), and because tiles making use of palette indices which have duplicate colors in the stock Duke 3D palette but not in other palettes (such as the 3D Realms screen) are negatively affected by the aforementioned process. git-svn-id: https://svn.eduke32.com/eduke32@5180 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:35 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,artfiletokens,countof(artfiletokens));
Defs: Add "artfile" token, which loads an ART file. You can use the "tile" sub-token to overwrite the starting tilenum of the file from def. artfile { file "whatever.art" } // loads whatever.art just as if it had been named TILES020.ART artfile { file "whatever.art" tile 2000 } // loads whatever.art starting at index 2000 instead of the tilestart value contained within it This is useful because ART files will load faster than images loaded through tilefromtexture (which must undergo a color matching process), and because tiles making use of palette indices which have duplicate colors in the stock Duke 3D palette but not in other palettes (such as the 3D Realms screen) are negatively affected by the aforementioned process. git-svn-id: https://svn.eduke32.com/eduke32@5180 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:35 +00:00
switch (token)
{
case T_FILE:
scriptfile_getstring(script,&fn);
break;
case T_TILE:
havetile = 1;
scriptfile_getsymbol(script,&tile);
break;
default:
break;
}
}
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
if (fn.IsEmpty())
Defs: Add "artfile" token, which loads an ART file. You can use the "tile" sub-token to overwrite the starting tilenum of the file from def. artfile { file "whatever.art" } // loads whatever.art just as if it had been named TILES020.ART artfile { file "whatever.art" tile 2000 } // loads whatever.art starting at index 2000 instead of the tilestart value contained within it This is useful because ART files will load faster than images loaded through tilefromtexture (which must undergo a color matching process), and because tiles making use of palette indices which have duplicate colors in the stock Duke 3D palette but not in other palettes (such as the 3D Realms screen) are negatively affected by the aforementioned process. git-svn-id: https://svn.eduke32.com/eduke32@5180 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:35 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "missing 'file name' for artfile definition");
Defs: Add "artfile" token, which loads an ART file. You can use the "tile" sub-token to overwrite the starting tilenum of the file from def. artfile { file "whatever.art" } // loads whatever.art just as if it had been named TILES020.ART artfile { file "whatever.art" tile 2000 } // loads whatever.art starting at index 2000 instead of the tilestart value contained within it This is useful because ART files will load faster than images loaded through tilefromtexture (which must undergo a color matching process), and because tiles making use of palette indices which have duplicate colors in the stock Duke 3D palette but not in other palettes (such as the 3D Realms screen) are negatively affected by the aforementioned process. git-svn-id: https://svn.eduke32.com/eduke32@5180 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:35 +00:00
break;
}
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (!check_tile("artfile", tile, script, pos))
- fixed compilation
2020-05-24 20:37:50 +00:00
TileFiles.LoadArtFile(fn, nullptr, tile);
Defs: Add "artfile" token, which loads an ART file. You can use the "tile" sub-token to overwrite the starting tilenum of the file from def. artfile { file "whatever.art" } // loads whatever.art just as if it had been named TILES020.ART artfile { file "whatever.art" tile 2000 } // loads whatever.art starting at index 2000 instead of the tilestart value contained within it This is useful because ART files will load faster than images loaded through tilefromtexture (which must undergo a color matching process), and because tiles making use of palette indices which have duplicate colors in the stock Duke 3D palette but not in other palettes (such as the 3D Realms screen) are negatively affected by the aforementioned process. git-svn-id: https://svn.eduke32.com/eduke32@5180 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:35 +00:00
}
break;
- reinstated setuptile. Apparently this is needed by some hires packs to fudge the sprite offsets. Fortunately, setting sprite offsets is the only thing this was ever used for so it's relatively uninvasive.
2020-09-23 14:54:52 +00:00
case T_SETUPTILE:
{
int tile, tmp;
if (scriptfile_getsymbol(script,&tile)) break;
if (check_tile("setuptile", tile, script, pos))
break;
auto& tiled = TileFiles.tiledata[tile];
if (scriptfile_getsymbol(script,&tmp)) break; // XXX
tiled.h_xsize = tmp;
if (scriptfile_getsymbol(script,&tmp)) break;
tiled.h_ysize = tmp;
if (scriptfile_getsymbol(script,&tmp)) break;
tiled.h_xoffs = tmp;
if (scriptfile_getsymbol(script,&tmp)) break;
tiled.h_yoffs = tmp;
break;
}
case T_SETUPTILERANGE:
{
int tile1,tile2,xsiz,ysiz,xoffs,yoffs,i;
if (scriptfile_getsymbol(script,&tile1)) break;
if (scriptfile_getsymbol(script,&tile2)) break;
if (scriptfile_getnumber(script,&xsiz)) break;
if (scriptfile_getnumber(script,&ysiz)) break;
if (scriptfile_getsymbol(script,&xoffs)) break;
if (scriptfile_getsymbol(script,&yoffs)) break;
if (check_tile_range("setuptilerange", &tile1, &tile2, script, pos))
break;
for (i=tile1; i<=tile2; i++)
{
auto& tiled = TileFiles.tiledata[i];
tiled.h_xsize = xsiz;
tiled.h_ysize = ysiz;
tiled.h_xoffs = xoffs;
tiled.h_yoffs = yoffs;
}
break;
}
Added a DEF command: animtilerange <tile1> <tile2> <speed> <type>. Note: it must be used with dummytiles. git-svn-id: https://svn.eduke32.com/eduke32@928 1a8010ca-5511-0410-912e-c29ae57300e0
2008-08-02 13:00:41 +00:00
case T_ANIMTILERANGE:
{
- moved implementation of 'animtilerange' into buildtiles.cpp.
2020-09-15 22:21:17 +00:00
SetAnim set;
if (scriptfile_getsymbol(script,&set.tile1)) break;
if (scriptfile_getsymbol(script,&set.tile2)) break;
if (scriptfile_getsymbol(script,&set.speed)) break;
if (scriptfile_getsymbol(script,&set.type)) break;
processSetAnim("animtilerange", pos, set);
Added a DEF command: animtilerange <tile1> <tile2> <speed> <type>. Note: it must be used with dummytiles. git-svn-id: https://svn.eduke32.com/eduke32@928 1a8010ca-5511-0410-912e-c29ae57300e0
2008-08-02 13:00:41 +00:00
break;
}
git-svn-id: https://svn.eduke32.com/eduke32@1151 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 11:31:05 +00:00
case T_TILEFROMTEXTURE:
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto texturepos = scriptfile_getposition(script);
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos textureend;
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
TileImport imp;
git-svn-id: https://svn.eduke32.com/eduke32@1151 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 11:31:05 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist tilefromtexturetokens[] =
{
{ "file", T_FILE },
{ "name", T_FILE },
{ "alphacut", T_ALPHACUT },
{ "xoffset", T_XOFFSET },
{ "xoff", T_XOFFSET },
{ "yoffset", T_YOFFSET },
{ "yoff", T_YOFFSET },
Texel-granular hitscan() for wall-aligned sprites. The attribute is set per tile from DEF: either texhitscanrange <begintile> <endtile> or tilefromtexture <tile> { ... texhitscan ... } (As a special case, the list may only contain "texhitscan", in which case the texture is not changed.) In passing, do some cleanup for "tilefromtexture" DEF parsing: the list tokens should now be accepted in any order, and errors don't appear in the middle of the list parsing. git-svn-id: https://svn.eduke32.com/eduke32@3078 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-14 20:41:34 +00:00
{ "texhitscan", T_TEXHITSCAN },
Expose per-tile nofullbright bit (GL modes only) to DEF. The attribute is set per tile from DEF: either nofullbrightrange <begintile> <endtile> or tilefromtexture <tile> { ... nofullbright ... } As a special case, the list may only contain "nofullbright", in which case the texture is not changed. (This is analogous to "texhitscan".) Example: // make piggy's eyes fullbright red only when it fires the shotgun nofullbrightrange 2000 2034 nofullbrightrange 2040 2049 nofullbrightrange 2055 2061 git-svn-id: https://svn.eduke32.com/eduke32@3230 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-25 13:19:06 +00:00
{ "nofullbright", T_NOFULLBRIGHT },
Defs: Add "texture" convenience token to tilefromtexture, which will also define the image as a texture with implied nocompress and nodownsize flags. git-svn-id: https://svn.eduke32.com/eduke32@5247 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:45:13 +00:00
{ "texture", T_TEXTURE },
Patch from Striker to allow selective tile redefinition in .def files based on the crc of the original tile This only works for "tilefromtexture" for now. git-svn-id: https://svn.eduke32.com/eduke32@7370 1a8010ca-5511-0410-912e-c29ae57300e0
2019-03-02 23:21:37 +00:00
{ "ifcrc", T_IFCRC },
Defs: Add tilefromtexture subtoken "ifmatch", with subtokens "crc32" and "size" git-svn-id: https://svn.eduke32.com/eduke32@8465 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/include/build.h # source/build/src/defs.cpp # source/build/src/tiles.cpp
2019-12-22 10:19:59 +00:00
{ "ifmatch", T_IFMATCH },
Add extra field to tilefromtexture # Conflicts: # source/build/src/defs.cpp
2019-07-23 15:56:39 +00:00
{ "extra", T_EXTRA },
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
// Blood also defines these.
{ "surface", T_SURFACE },
{ "voxel", T_VOXEL },
{ "view", T_VIEW },
{ "shade", T_SHADE },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
};
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
if (scriptfile_getsymbol(script,&imp.tile)) break;
git-svn-id: https://svn.eduke32.com/eduke32@1151 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 11:31:05 +00:00
if (scriptfile_getbraces(script,&textureend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, textureend))
git-svn-id: https://svn.eduke32.com/eduke32@1151 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 11:31:05 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,tilefromtexturetokens,countof(tilefromtexturetokens));
git-svn-id: https://svn.eduke32.com/eduke32@1151 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 11:31:05 +00:00
switch (token)
{
case T_FILE:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getstring(script,&imp.fn);
Defs: Allow loading ART files as input to tilefromtexture. Note that they must contain exactly one tile; any more and the entire ART file will be rejected. git-svn-id: https://svn.eduke32.com/eduke32@5178 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:04 +00:00
break;
git-svn-id: https://svn.eduke32.com/eduke32@1151 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 11:31:05 +00:00
case T_ALPHACUT:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script,&imp.alphacut);
imp.alphacut = clamp(imp.alphacut, 0, 255);
Defs: Allow loading ART files as input to tilefromtexture. Note that they must contain exactly one tile; any more and the entire ART file will be rejected. git-svn-id: https://svn.eduke32.com/eduke32@5178 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:04 +00:00
break;
git-svn-id: https://svn.eduke32.com/eduke32@1188 1a8010ca-5511-0410-912e-c29ae57300e0
2008-12-19 00:53:54 +00:00
case T_XOFFSET:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script,&imp.xoffset);
imp.xoffset = clamp(imp.xoffset, -128, 127);
Defs: Allow loading ART files as input to tilefromtexture. Note that they must contain exactly one tile; any more and the entire ART file will be rejected. git-svn-id: https://svn.eduke32.com/eduke32@5178 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:04 +00:00
break;
git-svn-id: https://svn.eduke32.com/eduke32@1188 1a8010ca-5511-0410-912e-c29ae57300e0
2008-12-19 00:53:54 +00:00
case T_YOFFSET:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script,&imp.yoffset);
imp.yoffset = clamp(imp.yoffset, -128, 127);
Defs: Allow loading ART files as input to tilefromtexture. Note that they must contain exactly one tile; any more and the entire ART file will be rejected. git-svn-id: https://svn.eduke32.com/eduke32@5178 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:04 +00:00
break;
Patch from Striker to allow selective tile redefinition in .def files based on the crc of the original tile This only works for "tilefromtexture" for now. git-svn-id: https://svn.eduke32.com/eduke32@7370 1a8010ca-5511-0410-912e-c29ae57300e0
2019-03-02 23:21:37 +00:00
case T_IFCRC:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script, &imp.crc32);
Patch from Striker to allow selective tile redefinition in .def files based on the crc of the original tile This only works for "tilefromtexture" for now. git-svn-id: https://svn.eduke32.com/eduke32@7370 1a8010ca-5511-0410-912e-c29ae57300e0
2019-03-02 23:21:37 +00:00
break;
Defs: Add tilefromtexture subtoken "ifmatch", with subtokens "crc32" and "size" git-svn-id: https://svn.eduke32.com/eduke32@8465 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/include/build.h # source/build/src/defs.cpp # source/build/src/tiles.cpp
2019-12-22 10:19:59 +00:00
case T_IFMATCH:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos ifmatchend;
Defs: Add tilefromtexture subtoken "ifmatch", with subtokens "crc32" and "size" git-svn-id: https://svn.eduke32.com/eduke32@8465 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/include/build.h # source/build/src/defs.cpp # source/build/src/tiles.cpp
2019-12-22 10:19:59 +00:00
static const tokenlist ifmatchtokens[] =
{
{ "crc32", T_CRC32 },
{ "size", T_SIZE },
};
if (scriptfile_getbraces(script,&ifmatchend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, ifmatchend))
Defs: Add tilefromtexture subtoken "ifmatch", with subtokens "crc32" and "size" git-svn-id: https://svn.eduke32.com/eduke32@8465 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/include/build.h # source/build/src/defs.cpp # source/build/src/tiles.cpp
2019-12-22 10:19:59 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,ifmatchtokens,countof(ifmatchtokens));
Defs: Add tilefromtexture subtoken "ifmatch", with subtokens "crc32" and "size" git-svn-id: https://svn.eduke32.com/eduke32@8465 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/include/build.h # source/build/src/defs.cpp # source/build/src/tiles.cpp
2019-12-22 10:19:59 +00:00
switch (token)
{
case T_CRC32:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script, &imp.crc32);
Defs: Add tilefromtexture subtoken "ifmatch", with subtokens "crc32" and "size" git-svn-id: https://svn.eduke32.com/eduke32@8465 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/include/build.h # source/build/src/defs.cpp # source/build/src/tiles.cpp
2019-12-22 10:19:59 +00:00
break;
case T_SIZE:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script, &imp.sizex);
scriptfile_getsymbol(script, &imp.sizey);
Defs: Add tilefromtexture subtoken "ifmatch", with subtokens "crc32" and "size" git-svn-id: https://svn.eduke32.com/eduke32@8465 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/include/build.h # source/build/src/defs.cpp # source/build/src/tiles.cpp
2019-12-22 10:19:59 +00:00
break;
default:
break;
}
}
break;
}
Texel-granular hitscan() for wall-aligned sprites. The attribute is set per tile from DEF: either texhitscanrange <begintile> <endtile> or tilefromtexture <tile> { ... texhitscan ... } (As a special case, the list may only contain "texhitscan", in which case the texture is not changed.) In passing, do some cleanup for "tilefromtexture" DEF parsing: the list tokens should now be accepted in any order, and errors don't appear in the middle of the list parsing. git-svn-id: https://svn.eduke32.com/eduke32@3078 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-14 20:41:34 +00:00
case T_TEXHITSCAN:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
imp.flags |= PICANM_TEXHITSCAN_BIT;
Updates to the processing of the tilefromtexture def command: - Allow xoffset and yoffset to modified independently of a tile definition, much like texhitscan and nofullbright. (Both still default to zero when a tile is specified, to keep current behavior, and because it makes sense.) - Add actual detection of the "nofullbright" keyword, which appears to have been overlooked in r3230. - Internal: Eliminate the need for one int32_t by condensing two variables into "flags". git-svn-id: https://svn.eduke32.com/eduke32@3973 1a8010ca-5511-0410-912e-c29ae57300e0
2013-07-20 03:37:10 +00:00
break;
case T_NOFULLBRIGHT:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
imp.flags |= PICANM_NOFULLBRIGHT_BIT;
git-svn-id: https://svn.eduke32.com/eduke32@1151 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 11:31:05 +00:00
break;
Defs: Add "texture" convenience token to tilefromtexture, which will also define the image as a texture with implied nocompress and nodownsize flags. git-svn-id: https://svn.eduke32.com/eduke32@5247 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:45:13 +00:00
case T_TEXTURE:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
imp.istexture = 1;
Defs: Add "texture" convenience token to tilefromtexture, which will also define the image as a texture with implied nocompress and nodownsize flags. git-svn-id: https://svn.eduke32.com/eduke32@5247 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:45:13 +00:00
break;
Add extra field to tilefromtexture # Conflicts: # source/build/src/defs.cpp
2019-07-23 15:56:39 +00:00
case T_EXTRA:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script, &imp.extra);
Add extra field to tilefromtexture # Conflicts: # source/build/src/defs.cpp
2019-07-23 15:56:39 +00:00
break;
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
case T_SURFACE:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script, &imp.surface);
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
break;
case T_VOXEL:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script, &imp.vox);
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
break;
case T_VIEW:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script, &imp.extra);
imp.extra &= 7;
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
break;
case T_SHADE:
- split the worker part for tileImportTexture out of the parser.
2020-09-14 23:21:17 +00:00
scriptfile_getsymbol(script, &imp.shade);
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
break;
Texel-granular hitscan() for wall-aligned sprites. The attribute is set per tile from DEF: either texhitscanrange <begintile> <endtile> or tilefromtexture <tile> { ... texhitscan ... } (As a special case, the list may only contain "texhitscan", in which case the texture is not changed.) In passing, do some cleanup for "tilefromtexture" DEF parsing: the list tokens should now be accepted in any order, and errors don't appear in the middle of the list parsing. git-svn-id: https://svn.eduke32.com/eduke32@3078 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-14 20:41:34 +00:00
default:
git-svn-id: https://svn.eduke32.com/eduke32@1151 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 11:31:05 +00:00
break;
}
}
- little bit of cleanup on tileImport.
2020-09-15 22:10:12 +00:00
processTileImport("tileimporttexture", pos, imp);
git-svn-id: https://svn.eduke32.com/eduke32@1151 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 11:31:05 +00:00
}
break;
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
case T_COPYTILE:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos blockend;
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
int32_t tile = -1, source;
int32_t havetile = 0, havexoffset = 0, haveyoffset = 0;
- transitioned all texture options of the def file
2019-10-15 21:38:01 +00:00
int32_t xoffset = -1024, yoffset = -1024;
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
int32_t flags = 0;
int32_t tsiz = 0;
- transitioned all texture options of the def file
2019-10-15 21:38:01 +00:00
int32_t temppal = -1;
int32_t tempsource = -1;
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
static const tokenlist copytiletokens[] =
{
{ "tile", T_TILE },
{ "pal", T_PAL },
{ "xoffset", T_XOFFSET },
{ "xoff", T_XOFFSET },
{ "yoffset", T_YOFFSET },
{ "yoff", T_YOFFSET },
{ "texhitscan", T_TEXHITSCAN },
{ "nofullbright", T_NOFULLBRIGHT },
};
if (scriptfile_getsymbol(script,&tile)) break;
source = tile; // without a "tile" token, we still palettize self by default
if (scriptfile_getbraces(script,&blockend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, blockend))
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,copytiletokens,countof(copytiletokens));
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
switch (token)
{
case T_TILE:
{
scriptfile_getsymbol(script,&tempsource);
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("copytile", tempsource, script, pos))
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
break;
source = tempsource;
havetile = 1;
break;
}
case T_PAL:
{
scriptfile_getsymbol(script,&temppal);
// palettize self case
if (!havetile)
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("copytile", source, script, pos))
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
break;
havetile = 1;
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)temppal >= MAXPALOOKUPS-RESERVEDPALS)
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "copytile 'palette number' out of range (max=%d)\n",
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
MAXPALOOKUPS-RESERVEDPALS-1);
break;
}
break;
}
case T_XOFFSET:
havexoffset = 1;
scriptfile_getsymbol(script,&xoffset); break;
case T_YOFFSET:
haveyoffset = 1;
scriptfile_getsymbol(script,&yoffset); break;
case T_TEXHITSCAN:
flags |= PICANM_TEXHITSCAN_BIT;
break;
case T_NOFULLBRIGHT:
flags |= PICANM_NOFULLBRIGHT_BIT;
break;
default:
break;
}
}
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("copytile", tile, script, pos))
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
break;
- transitioned all texture options of the def file
2019-10-15 21:38:01 +00:00
if (!havetile)
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
{
- transitioned all texture options of the def file
2019-10-15 21:38:01 +00:00
// if !havetile, we have never confirmed a valid source
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("copytile", source, script, pos))
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
break;
}
- transitioned all texture options of the def file
2019-10-15 21:38:01 +00:00
tileCopy(tile, tempsource, temppal, xoffset, yoffset, flags);
Defs: Add "copytile" token that allows you to copy existing 8-bit tiles from one slot to another, along with their x/yoffsets and flags. ART animation values are not copied. Examples: (assuming stock Duke palswaps) copytile 10000 { tile 0 } // tile #10000 is now the same as #0 copytile 10001 { tile 1 pal 8 } // tile #10001 is now #1 with a full-green tint copytile 0 { pal 1 pal 23 } // tile #0 now has a full-yellow tint git-svn-id: https://svn.eduke32.com/eduke32@5139 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:07:30 +00:00
}
break;
git-svn-id: https://svn.eduke32.com/eduke32@1150 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 09:22:07 +00:00
case T_IMPORTTILE:
{
Defs: Allow loading ART files as input to tilefromtexture. Note that they must contain exactly one tile; any more and the entire ART file will be rejected. git-svn-id: https://svn.eduke32.com/eduke32@5178 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:04 +00:00
int32_t tile;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
git-svn-id: https://svn.eduke32.com/eduke32@1150 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 09:22:07 +00:00
if (scriptfile_getsymbol(script,&tile)) break;
if (scriptfile_getstring(script,&fn)) break;
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("importtile", tile, script, pos))
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
break;
git-svn-id: https://svn.eduke32.com/eduke32@1150 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 09:22:07 +00:00
- transitioned all texture options of the def file
2019-10-15 21:38:01 +00:00
int32_t const texstatus = tileImportFromTexture(fn, tile, 255, 0);
Defs: Allow loading ART files as input to tilefromtexture. Note that they must contain exactly one tile; any more and the entire ART file will be rejected. git-svn-id: https://svn.eduke32.com/eduke32@5178 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:05:04 +00:00
if (texstatus < 0)
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
break;
- small bits of cleanup.
2019-10-08 20:23:48 +00:00
picanm[tile] = {};
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@1150 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-24 09:22:07 +00:00
break;
}
Adds dummy tile support for the def files so that placeholders for hightile textures are no longer needed in the art files git-svn-id: https://svn.eduke32.com/eduke32@116 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-26 01:25:18 +00:00
case T_DUMMYTILE:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
int32_t tile, xsiz, ysiz;
Adds dummy tile support for the def files so that placeholders for hightile textures are no longer needed in the art files git-svn-id: https://svn.eduke32.com/eduke32@116 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-26 01:25:18 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getsymbol(script,&tile)) break;
if (scriptfile_getsymbol(script,&xsiz)) break;
if (scriptfile_getsymbol(script,&ysiz)) break;
dummytile updates git-svn-id: https://svn.eduke32.com/eduke32@257 1a8010ca-5511-0410-912e-c29ae57300e0
2006-08-04 04:01:17 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("dummytile", tile, script, pos))
Defs: Expand use of check_tile(). git-svn-id: https://svn.eduke32.com/eduke32@5137 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:06:51 +00:00
break;
Defs: Add "undefinetile" and "undefinetilerange". git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:52:28 +00:00
- tileDelete / tileSetDummy
2019-10-15 21:29:47 +00:00
tileSetDummy(tile, xsiz, ysiz);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Adds dummy tile support for the def files so that placeholders for hightile textures are no longer needed in the art files git-svn-id: https://svn.eduke32.com/eduke32@116 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-26 01:25:18 +00:00
case T_DUMMYTILERANGE:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
int32_t tile1,tile2,xsiz,ysiz,i;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
Ensure that anywhere the def parser takes a tilenum or palnum accepts defined tokens in addition to integer literals, if it doesn't already. Affects fogpal, nofloorpalrange, setuptilerange, dummytilerange, undefinetilerange, definemodelframe, definevoxeltiles, texhitscanrange, nofullbrightrange, and light. git-svn-id: https://svn.eduke32.com/eduke32@6896 1a8010ca-5511-0410-912e-c29ae57300e0
2018-05-23 05:43:35 +00:00
if (scriptfile_getsymbol(script,&tile1)) break;
if (scriptfile_getsymbol(script,&tile2)) break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getnumber(script,&xsiz)) break;
if (scriptfile_getnumber(script,&ysiz)) break;
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile_range("dummytilerange", &tile1, &tile2, script, pos))
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
break;
Defs: Add "undefinetile" and "undefinetilerange". git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:52:28 +00:00
if (xsiz < 0 || ysiz < 0)
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
break; // TODO: message
for (i=tile1; i<=tile2; i++)
Adds dummy tile support for the def files so that placeholders for hightile textures are no longer needed in the art files git-svn-id: https://svn.eduke32.com/eduke32@116 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-26 01:25:18 +00:00
{
- tileDelete / tileSetDummy
2019-10-15 21:29:47 +00:00
tileSetDummy(i, xsiz, ysiz);
Adds dummy tile support for the def files so that placeholders for hightile textures are no longer needed in the art files git-svn-id: https://svn.eduke32.com/eduke32@116 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-26 01:25:18 +00:00
}
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Adds dummy tile support for the def files so that placeholders for hightile textures are no longer needed in the art files git-svn-id: https://svn.eduke32.com/eduke32@116 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-26 01:25:18 +00:00
Defs: Add "undefinetile" and "undefinetilerange". git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:52:28 +00:00
case T_UNDEFINETILE:
{
int32_t tile;
if (scriptfile_getsymbol(script,&tile)) break;
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("undefinetile", tile, script, pos))
Defs: Expand use of check_tile(). git-svn-id: https://svn.eduke32.com/eduke32@5137 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:06:51 +00:00
break;
Defs: Add "undefinetile" and "undefinetilerange". git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:52:28 +00:00
More function name cleanup git-svn-id: https://svn.eduke32.com/eduke32@6830 1a8010ca-5511-0410-912e-c29ae57300e0
2018-04-12 21:03:30 +00:00
tileDelete(tile);
Defs: Add "undefinetile" and "undefinetilerange". git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:52:28 +00:00
break;
}
case T_UNDEFINETILERANGE:
{
int32_t tile1, tile2;
Ensure that anywhere the def parser takes a tilenum or palnum accepts defined tokens in addition to integer literals, if it doesn't already. Affects fogpal, nofloorpalrange, setuptilerange, dummytilerange, undefinetilerange, definemodelframe, definevoxeltiles, texhitscanrange, nofullbrightrange, and light. git-svn-id: https://svn.eduke32.com/eduke32@6896 1a8010ca-5511-0410-912e-c29ae57300e0
2018-05-23 05:43:35 +00:00
if (scriptfile_getsymbol(script,&tile1)) break;
if (scriptfile_getsymbol(script,&tile2)) break;
Defs: Add "undefinetile" and "undefinetilerange". git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:52:28 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile_range("undefinetilerange", &tile1, &tile2, script, pos))
Defs: Add "undefinetile" and "undefinetilerange". git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:52:28 +00:00
break;
Use size_t or ssize_t in for loops where possible git-svn-id: https://svn.eduke32.com/eduke32@5829 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:41:21 +00:00
for (bssize_t i = tile1; i <= tile2; i++)
More function name cleanup git-svn-id: https://svn.eduke32.com/eduke32@6830 1a8010ca-5511-0410-912e-c29ae57300e0
2018-04-12 21:03:30 +00:00
tileDelete(i);
Defs: Add "undefinetile" and "undefinetilerange". git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:52:28 +00:00
break;
}
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_DEFINEMODEL:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString modelfn;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
double scale;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t shadeoffs;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getstring(script,&modelfn)) break;
if (scriptfile_getdouble(script,&scale)) break;
if (scriptfile_getnumber(script,&shadeoffs)) break;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
lastmodelid = md_loadmodel(modelfn);
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (lastmodelid < 0)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
Printf("Warning: Failed loading MD2/MD3 model \"%s\"\n", modelfn.GetChars());
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Add the 'yoffset' token to model definitions to allow models to compensate for ART tiles with large yoffsets, such as #603. Under normal circumstances the existing 'zadd' parameter should be used instead. Special thanks to Supertanker. git-svn-id: https://svn.eduke32.com/eduke32@2264 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-17 04:31:59 +00:00
md_setmisc(lastmodelid,(float)scale, shadeoffs,0.0,0.0,0);
- removed dead Polymer handling in model code.
2020-08-16 07:36:32 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
modelskin = lastmodelskin = 0;
seenframe = 0;
}
break;
case T_DEFINEMODELFRAME:
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString framename;
Fix building with USE_OPENGL=0 and POLYMOST=0 and replace all instances in the game code in which the bpp or rendmode vars are checked directly with calls to getrendermode() git-svn-id: https://svn.eduke32.com/eduke32@895 1a8010ca-5511-0410-912e-c29ae57300e0
2008-07-24 11:16:20 +00:00
char happy=1;
Fix warnings that appear if big-endian || USE_OPENGL=0. git-svn-id: https://svn.eduke32.com/eduke32@3382 1a8010ca-5511-0410-912e-c29ae57300e0
2013-01-08 06:17:10 +00:00
int32_t tilex;
int32_t ftilenume, ltilenume;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getstring(script,&framename)) break;
Ensure that anywhere the def parser takes a tilenum or palnum accepts defined tokens in addition to integer literals, if it doesn't already. Affects fogpal, nofloorpalrange, setuptilerange, dummytilerange, undefinetilerange, definemodelframe, definevoxeltiles, texhitscanrange, nofullbrightrange, and light. git-svn-id: https://svn.eduke32.com/eduke32@6896 1a8010ca-5511-0410-912e-c29ae57300e0
2018-05-23 05:43:35 +00:00
if (scriptfile_getsymbol(script,&ftilenume)) break; //first tile number
if (scriptfile_getsymbol(script,&ltilenume)) break; //last tile number (inclusive)
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile_range("definemodelframe", &ftilenume, &ltilenume, script, pos))
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (lastmodelid < 0)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_WARNING, "Ignoring frame definition.\n");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
for (tilex = ftilenume; tilex <= ltilenume && happy; tilex++)
{
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
switch (md_defineframe(lastmodelid, framename, tilex, max(0,modelskin), 0.0f,0))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case -1:
happy = 0; break; // invalid model id!?
case -2:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
Printf("Invalid tile number");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
happy = 0;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case -3:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
Printf("Invalid frame name");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
happy = 0;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
break;
* Thin out models in memory by removing unused frames. This saves 200MB with DNE on Polymer. * fix memory corruption when loading a Polymer savegame using another renderer and then change to Polymer * fix possible crash in OSD_Exec() and uninitialized mem access in game config reader * move makeasmwriteable() to baselayer.c git-svn-id: https://svn.eduke32.com/eduke32@1910 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 18:30:32 +00:00
default:
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
seenframe = 1;
}
break;
case T_DEFINEMODELANIM:
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString startframe, endframe;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t flags;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
double dfps;
if (scriptfile_getstring(script,&startframe)) break;
if (scriptfile_getstring(script,&endframe)) break;
if (scriptfile_getdouble(script,&dfps)) break; //animation frame rate
if (scriptfile_getnumber(script,&flags)) break;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (lastmodelid < 0)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- use Printf as the only command to print to the console. All uses of OSD_Printf, initprintf etc. have been renamed.
2020-04-11 21:45:45 +00:00
Printf("Warning: Ignoring animation definition.\n");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
switch (md_defineanimation(lastmodelid, startframe, endframe, (int32_t)(dfps*(65536.0*.001)), flags))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case 0:
break;
case -1:
break; // invalid model id!?
case -2:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
Printf("Invalid starting frame name");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
case -3:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
Printf("Invalid ending frame name");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
case -4:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
Printf("Out of memory");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_DEFINEMODELSKIN:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
int32_t palnum;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString skinfn;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getsymbol(script,&palnum)) break;
if (scriptfile_getstring(script,&skinfn)) break; //skin filename
// if we see a sequence of definemodelskin, then a sequence of definemodelframe,
// and then a definemodelskin, we need to increment the skin counter.
//
// definemodel "mymodel.md2" 1 1
// definemodelskin 0 "normal.png" // skin 0
// definemodelskin 21 "normal21.png"
// definemodelframe "foo" 1000 1002 // these use skin 0
// definemodelskin 0 "wounded.png" // skin 1
// definemodelskin 21 "wounded21.png"
// definemodelframe "foo2" 1003 1004 // these use skin 1
// selectmodelskin 0 // resets to skin 0
// definemodelframe "foo3" 1005 1006 // these use skin 0
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
if (seenframe) { modelskin = ++lastmodelskin; }
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
seenframe = 0;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
- fixed bad file checks in defs parser.
2020-09-12 10:39:18 +00:00
if (!fileSystem.FileExists(skinfn))
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
break;
Add file existence check for model skins. git-svn-id: https://svn.eduke32.com/eduke32@2436 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-10 09:44:54 +00:00
Defs: Add "nocompress" and "nodownsize" tokens to model skin definitions. git-svn-id: https://svn.eduke32.com/eduke32@5107 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-28 09:49:11 +00:00
switch (md_defineskin(lastmodelid, skinfn, palnum, max(0,modelskin), 0, 0.0f, 1.0f, 1.0f, 0))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case 0:
break;
case -1:
break; // invalid model id!?
case -2:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
Printf("Invalid skin filename");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
case -3:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
Printf("Invalid palette number");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
case -4:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
Printf("Out of memory");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_SELECTMODELSKIN:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
if (scriptfile_getsymbol(script,&modelskin)) break;
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_DEFINEVOXEL:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (scriptfile_getstring(script,&fn))
engine.c: style-cleanup drawvox(). Also clean up ALL of voxmodel.c. No deliberate semantic changes here. git-svn-id: https://svn.eduke32.com/eduke32@4834 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:48 +00:00
break; //voxel filename
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
- Blood merge # Conflicts: # source/build/include/polymost.h # source/build/src/build.cpp # source/build/src/engine.cpp # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp
2019-09-19 20:02:45 +00:00
while (nextvoxid < MAXVOXELS && (voxreserve[nextvoxid>>3]&(1<<(nextvoxid&7))))
nextvoxid++;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (nextvoxid == MAXVOXELS)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- use Printf as the only command to print to the console. All uses of OSD_Printf, initprintf etc. have been renamed.
2020-04-11 21:45:45 +00:00
Printf("Maximum number of voxels (%d) already defined.\n", MAXVOXELS);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (qloadkvx(nextvoxid, fn))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
Printf("Failure loading voxel file \"%s\"\n",fn.GetChars());
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
lastvoxid = nextvoxid++;
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_DEFINEVOXELTILES:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t ftilenume, ltilenume, tilex;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
Ensure that anywhere the def parser takes a tilenum or palnum accepts defined tokens in addition to integer literals, if it doesn't already. Affects fogpal, nofloorpalrange, setuptilerange, dummytilerange, undefinetilerange, definemodelframe, definevoxeltiles, texhitscanrange, nofullbrightrange, and light. git-svn-id: https://svn.eduke32.com/eduke32@6896 1a8010ca-5511-0410-912e-c29ae57300e0
2018-05-23 05:43:35 +00:00
if (scriptfile_getsymbol(script,&ftilenume)) break; //1st tile #
if (scriptfile_getsymbol(script,&ltilenume)) break; //last tile #
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile_range("definevoxeltiles", &ftilenume, &ltilenume, script, pos))
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (lastvoxid < 0)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- use Printf as the only command to print to the console. All uses of OSD_Printf, initprintf etc. have been renamed.
2020-04-11 21:45:45 +00:00
Printf("Warning: Ignoring voxel tiles definition.\n");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Consolidate POLYMOST preprocessor define into USE_OPENGL, remove SUPERBUILD preprocessor define, add additional mode to neartag() to skip sprite searches and speed up processing (and enable for CON_OPERATE), fix issue with nearby single instance sounds not playing due to out of range sounds blocking their playback, fix issue with settings.cfg being reset to default bindings when running a mod that specifies its own cfg base name, improve CON structure member interface read/write performance, fix a bug with CON "move" pointer validation git-svn-id: https://svn.eduke32.com/eduke32@1820 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-04 08:50:58 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
for (tilex = ftilenume; tilex <= ltilenume; tilex++)
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
tiletovox[tilex] = lastvoxid;
}
break;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
// NEW (ENCOURAGED) DEFINITION SYNTAX
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_MODEL:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos modelend;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString modelfn;
Add the 'yoffset' token to model definitions to allow models to compensate for ART tiles with large yoffsets, such as #603. Under normal circumstances the existing 'zadd' parameter should be used instead. Special thanks to Supertanker. git-svn-id: https://svn.eduke32.com/eduke32@2264 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-17 04:31:59 +00:00
double scale=1.0, mzadd=0.0, myoffset=0.0;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t shadeoffs=0, pal=0, flags=0;
Fix another bunch of improperly sized bitmap arrays git-svn-id: https://svn.eduke32.com/eduke32@7806 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/src/build.cpp
2019-07-19 01:49:19 +00:00
uint8_t usedframebitmap[(1024+7)>>3];
* Thin out models in memory by removing unused frames. This saves 200MB with DNE on Polymer. * fix memory corruption when loading a Polymer savegame using another renderer and then change to Polymer * fix possible crash in OSD_Exec() and uninitialized mem access in game config reader * move makeasmwriteable() to baselayer.c git-svn-id: https://svn.eduke32.com/eduke32@1910 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 18:30:32 +00:00
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
int32_t model_ok = 1;
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist modeltokens[] =
{
{ "scale", T_SCALE },
{ "shade", T_SHADE },
{ "zadd", T_ZADD },
Add the 'yoffset' token to model definitions to allow models to compensate for ART tiles with large yoffsets, such as #603. Under normal circumstances the existing 'zadd' parameter should be used instead. Special thanks to Supertanker. git-svn-id: https://svn.eduke32.com/eduke32@2264 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-17 04:31:59 +00:00
{ "yoffset", T_YOFFSET },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
{ "frame", T_FRAME },
{ "anim", T_ANIM },
{ "skin", T_SKIN },
{ "detail", T_DETAIL },
{ "glow", T_GLOW },
{ "specular", T_SPECULAR },
{ "normal", T_NORMAL },
{ "hud", T_HUD },
{ "flags", T_FLAGS },
};
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
memset(usedframebitmap, 0, sizeof(usedframebitmap));
fix MSVC build git-svn-id: https://svn.eduke32.com/eduke32@1925 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-01 12:22:12 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
modelskin = lastmodelskin = 0;
seenframe = 0;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getstring(script,&modelfn)) break;
git-svn-id: https://svn.eduke32.com/eduke32@875 1a8010ca-5511-0410-912e-c29ae57300e0
2008-07-20 04:12:52 +00:00
if (scriptfile_getbraces(script,&modelend)) break;
- cleanup and minor fixes.
2020-09-22 21:07:11 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
lastmodelid = md_loadmodel(modelfn);
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (lastmodelid < 0)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
Printf("Warning: Failed loading MD2/MD3 model \"%s\"\n", modelfn.GetChars());
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
scriptfile_setposition(script, modelend);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, modelend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,modeltokens,countof(modeltokens));
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
switch (token)
{
- use Printf as the only command to print to the console. All uses of OSD_Printf, initprintf etc. have been renamed.
2020-04-11 21:45:45 +00:00
//case T_ERROR: Printf("Error on line %s:%d in model tokens\n", script->filename,script->linenum); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_SCALE:
scriptfile_getdouble(script,&scale); break;
case T_SHADE:
scriptfile_getnumber(script,&shadeoffs); break;
case T_ZADD:
scriptfile_getdouble(script,&mzadd); break;
Add the 'yoffset' token to model definitions to allow models to compensate for ART tiles with large yoffsets, such as #603. Under normal circumstances the existing 'zadd' parameter should be used instead. Special thanks to Supertanker. git-svn-id: https://svn.eduke32.com/eduke32@2264 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-17 04:31:59 +00:00
case T_YOFFSET:
scriptfile_getdouble(script,&myoffset); break;
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
case T_FLAGS:
scriptfile_getnumber(script,&flags); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_FRAME:
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto framepos = scriptfile_getposition(script);
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos frameend;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString framename;
Fix warnings that appear if big-endian || USE_OPENGL=0. git-svn-id: https://svn.eduke32.com/eduke32@3382 1a8010ca-5511-0410-912e-c29ae57300e0
2013-01-08 06:17:10 +00:00
char happy=1;
int32_t tilex = 0, framei;
int32_t ftilenume = -1, ltilenume = -1;
git-svn-id: https://svn.eduke32.com/eduke32@1178 1a8010ca-5511-0410-912e-c29ae57300e0
2008-12-10 11:36:53 +00:00
double smoothduration = 0.1f;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist modelframetokens[] =
{
{ "pal", T_PAL },
{ "frame", T_FRAME },
{ "name", T_FRAME },
{ "tile", T_TILE },
{ "tile0", T_TILE0 },
{ "tile1", T_TILE1 },
{ "smoothduration", T_SMOOTHDURATION },
};
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getbraces(script,&frameend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, frameend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,modelframetokens,countof(modelframetokens)))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
case T_PAL:
Ensure that anywhere the def parser takes a tilenum or palnum accepts defined tokens in addition to integer literals, if it doesn't already. Affects fogpal, nofloorpalrange, setuptilerange, dummytilerange, undefinetilerange, definemodelframe, definevoxeltiles, texhitscanrange, nofullbrightrange, and light. git-svn-id: https://svn.eduke32.com/eduke32@6896 1a8010ca-5511-0410-912e-c29ae57300e0
2018-05-23 05:43:35 +00:00
scriptfile_getsymbol(script,&pal); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_FRAME:
scriptfile_getstring(script,&framename); break;
case T_TILE:
scriptfile_getsymbol(script,&ftilenume); ltilenume = ftilenume; break;
case T_TILE0:
scriptfile_getsymbol(script,&ftilenume); break; //first tile number
case T_TILE1:
scriptfile_getsymbol(script,&ltilenume); break; //last tile number (inclusive)
smoothduration def token for model frame definitions (defaults at 0) git-svn-id: https://svn.eduke32.com/eduke32@531 1a8010ca-5511-0410-912e-c29ae57300e0
2007-04-12 03:09:41 +00:00
case T_SMOOTHDURATION:
scriptfile_getdouble(script,&smoothduration); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
}
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile_range("model: frame", &ftilenume, &ltilenume, script, pos))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
model_ok = 0;
break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (lastmodelid < 0)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
framepos.Message(MSG_WARNING, "ignoring frame definition");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Engine memory reductions/optimizations: -faketilesiz[MAXTILES] removed in favor of simple faketile[(MAXTILES+7)>>3] bitfield -h_xsize/h_ysize (tile size overrides from .def) are now uint16_t instead of int32_t -hudmem[2][MAXTILES] removed in favor of adding a hudmem ptr to mdmodel_t -tilefromtexture performance improvements -more tsectortype/twalltype usage in various engine functions that read but never write -continued Polymost cleanups and refactors. Please report any odd rendering errors. git-svn-id: https://svn.eduke32.com/eduke32@5079 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-24 00:40:48 +00:00
if (smoothduration > 1.0)
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
framepos.Message(MSG_WARNING, "smoothduration out of range");
Engine memory reductions/optimizations: -faketilesiz[MAXTILES] removed in favor of simple faketile[(MAXTILES+7)>>3] bitfield -h_xsize/h_ysize (tile size overrides from .def) are now uint16_t instead of int32_t -hudmem[2][MAXTILES] removed in favor of adding a hudmem ptr to mdmodel_t -tilefromtexture performance improvements -more tsectortype/twalltype usage in various engine functions that read but never write -continued Polymost cleanups and refactors. Please report any odd rendering errors. git-svn-id: https://svn.eduke32.com/eduke32@5079 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-24 00:40:48 +00:00
smoothduration = 1.0;
}
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
for (tilex = ftilenume; tilex <= ltilenume && happy; tilex++)
{
* Thin out models in memory by removing unused frames. This saves 200MB with DNE on Polymer. * fix memory corruption when loading a Polymer savegame using another renderer and then change to Polymer * fix possible crash in OSD_Exec() and uninitialized mem access in game config reader * move makeasmwriteable() to baselayer.c git-svn-id: https://svn.eduke32.com/eduke32@1910 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 18:30:32 +00:00
framei = md_defineframe(lastmodelid, framename, tilex, max(0,modelskin), smoothduration,pal);
switch (framei)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case -1:
happy = 0; break; // invalid model id!?
case -2:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
framepos.Message(MSG_WARNING, "Invalid tile number");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
happy = 0;
break;
case -3:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
framepos.Message(MSG_WARNING, "%s: Invalid frame name", framename.GetChars());
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
happy = 0;
break;
* Thin out models in memory by removing unused frames. This saves 200MB with DNE on Polymer. * fix memory corruption when loading a Polymer savegame using another renderer and then change to Polymer * fix possible crash in OSD_Exec() and uninitialized mem access in game config reader * move makeasmwriteable() to baselayer.c git-svn-id: https://svn.eduke32.com/eduke32@1910 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 18:30:32 +00:00
default:
if (framei >= 0 && framei<1024)
Replace runtime pow2 calculations with pow2char LUT usage I don't know that this is any faster, but there's something to be said for standardization and consistency. I will be making most of this stuff use bitmap_set/test/clear() soon. git-svn-id: https://svn.eduke32.com/eduke32@7876 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/src/build.cpp # source/build/src/polymost.cpp
2019-08-04 02:51:50 +00:00
usedframebitmap[framei>>3] |= pow2char[framei&7];
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
model_ok &= happy;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
seenframe = 1;
}
break;
case T_ANIM:
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto animpos = scriptfile_getposition(script);
FScanner::SavedPos animend;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString startframe, endframe;
int happy=1;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t flags = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
double dfps = 1.0;
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist modelanimtokens[] =
{
{ "frame0", T_FRAME0 },
{ "frame1", T_FRAME1 },
{ "fps", T_FPS },
{ "flags", T_FLAGS },
};
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getbraces(script,&animend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, animend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,modelanimtokens,countof(modelanimtokens)))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_FRAME0:
scriptfile_getstring(script,&startframe); break;
case T_FRAME1:
scriptfile_getstring(script,&endframe); break;
case T_FPS:
scriptfile_getdouble(script,&dfps); break; //animation frame rate
case T_FLAGS:
scriptfile_getsymbol(script,&flags); break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (startframe.IsEmpty()) animpos.Message(MSG_ERROR, "missing 'start frame' for anim definition"), happy = 0;
if (endframe.IsEmpty()) animpos.Message(MSG_ERROR, "missing 'end frame' for anim definition"), happy = 0;
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
model_ok &= happy;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (!happy) break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (lastmodelid < 0)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- use Printf as the only command to print to the console. All uses of OSD_Printf, initprintf etc. have been renamed.
2020-04-11 21:45:45 +00:00
Printf("Warning: Ignoring animation definition.\n");
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
switch (md_defineanimation(lastmodelid, startframe, endframe, (int32_t)(dfps*(65536.0*.001)), flags))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case 0:
break;
case -1:
break; // invalid model id!?
case -2:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "Invalid starting frame name");
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
model_ok = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
case -3:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "Invalid ending frame name");
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
model_ok = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
case -4:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "Out of memory");
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
model_ok = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
}
break;
Modified priority system to use 6 priority levels instead of 3, added proper def syntax "specular" and "normal" which work identically to "detail" and "glow" for defining normals and specular maps (defining these with pals 100 and 101 will no longer work) git-svn-id: https://svn.eduke32.com/eduke32@1350 1a8010ca-5511-0410-912e-c29ae57300e0
2009-04-28 22:56:43 +00:00
case T_SKIN: case T_DETAIL: case T_GLOW: case T_SPECULAR: case T_NORMAL:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto skinpos = scriptfile_getposition(script);
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos skinend;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString skinfn;
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
int32_t palnum = 0, surfnum = 0;
Adds specpower and specfactor tokens for model skins. git-svn-id: https://svn.eduke32.com/eduke32@1279 1a8010ca-5511-0410-912e-c29ae57300e0
2009-03-28 15:19:44 +00:00
double param = 1.0, specpower = 1.0, specfactor = 1.0;
Defs: Add "nocompress" and "nodownsize" tokens to model skin definitions. git-svn-id: https://svn.eduke32.com/eduke32@5107 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-28 09:49:11 +00:00
int32_t flags = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist modelskintokens[] =
{
{ "pal", T_PAL },
{ "file", T_FILE },
{ "surf", T_SURF },
{ "surface", T_SURF },
{ "intensity", T_PARAM },
{ "scale", T_PARAM },
{ "detailscale", T_PARAM },
Add "specularpower" and "specularfactor" as synonyms of "specpower" and "specfactor" respectively. git-svn-id: https://svn.eduke32.com/eduke32@2539 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-26 05:06:31 +00:00
{ "specpower", T_SPECPOWER }, { "specularpower", T_SPECPOWER }, { "parallaxscale", T_SPECPOWER },
{ "specfactor", T_SPECFACTOR }, { "specularfactor", T_SPECFACTOR }, { "parallaxbias", T_SPECFACTOR },
Defs: Add "nocompress" and "nodownsize" tokens to model skin definitions. git-svn-id: https://svn.eduke32.com/eduke32@5107 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-28 09:49:11 +00:00
{ "nocompress", T_NOCOMPRESS },
{ "nodownsize", T_NODOWNSIZE },
Defs: Add token "forcefilter" to textures, skyboxes, and model skins. It forces the use of GL filtering for the resource in question. git-svn-id: https://svn.eduke32.com/eduke32@5108 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-28 09:49:37 +00:00
{ "forcefilter", T_FORCEFILTER },
Defs: Add "artquality" subtoken to textures, model skins, and skyboxes, which grants the texture HICR_ARTIMMUNITY. In effect, this implies "nodownsize" and signals that texture compression would be undesirable, but okay using r_texcompr mode 2 (aggressive). git-svn-id: https://svn.eduke32.com/eduke32@5705 1a8010ca-5511-0410-912e-c29ae57300e0
2016-05-02 18:29:35 +00:00
{ "artquality", T_ARTQUALITY },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
};
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getbraces(script,&skinend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, skinend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,modelskintokens,countof(modelskintokens)))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_PAL:
scriptfile_getsymbol(script,&palnum); break;
Various fixes and detail texturing on models. git-svn-id: https://svn.eduke32.com/eduke32@501 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 01:34:41 +00:00
case T_PARAM:
scriptfile_getdouble(script,&param); break;
Adds specpower and specfactor tokens for model skins. git-svn-id: https://svn.eduke32.com/eduke32@1279 1a8010ca-5511-0410-912e-c29ae57300e0
2009-03-28 15:19:44 +00:00
case T_SPECPOWER:
scriptfile_getdouble(script,&specpower); break;
case T_SPECFACTOR:
scriptfile_getdouble(script,&specfactor); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_FILE:
scriptfile_getstring(script,&skinfn); break; //skin filename
case T_SURF:
scriptfile_getnumber(script,&surfnum); break;
}
}
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
if (skinfn.IsEmpty())
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
skinpos.Message(MSG_ERROR, "missing 'skin filename' for skin definition");
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
model_ok = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
if (seenframe) { modelskin = ++lastmodelskin; }
seenframe = 0;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
switch (token)
Various fixes and detail texturing on models. git-svn-id: https://svn.eduke32.com/eduke32@501 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 01:34:41 +00:00
{
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
case T_DETAIL:
Various fixes and detail texturing on models. git-svn-id: https://svn.eduke32.com/eduke32@501 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 01:34:41 +00:00
palnum = DETAILPAL;
param = 1.0f / param;
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
break;
case T_GLOW:
Various fixes and detail texturing on models. git-svn-id: https://svn.eduke32.com/eduke32@501 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 01:34:41 +00:00
palnum = GLOWPAL;
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
break;
Modified priority system to use 6 priority levels instead of 3, added proper def syntax "specular" and "normal" which work identically to "detail" and "glow" for defining normals and specular maps (defining these with pals 100 and 101 will no longer work) git-svn-id: https://svn.eduke32.com/eduke32@1350 1a8010ca-5511-0410-912e-c29ae57300e0
2009-04-28 22:56:43 +00:00
case T_SPECULAR:
palnum = SPECULARPAL;
break;
case T_NORMAL:
palnum = NORMALPAL;
break;
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
}
Various fixes and detail texturing on models. git-svn-id: https://svn.eduke32.com/eduke32@501 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 01:34:41 +00:00
- fixed bad file checks in defs parser.
2020-09-12 10:39:18 +00:00
if (!fileSystem.FileExists(skinfn))
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
break;
Add file existence check for model skins. git-svn-id: https://svn.eduke32.com/eduke32@2436 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-10 09:44:54 +00:00
Defs: Add "nocompress" and "nodownsize" tokens to model skin definitions. git-svn-id: https://svn.eduke32.com/eduke32@5107 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-28 09:49:11 +00:00
switch (md_defineskin(lastmodelid, skinfn, palnum, max(0,modelskin), surfnum, param, specpower, specfactor, flags))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case 0:
break;
case -1:
break; // invalid model id!?
case -2:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
skinpos.Message(MSG_ERROR, "Invalid skin filename");
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
model_ok = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
case -3:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
skinpos.Message(MSG_ERROR, "Invalid palette number");
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
model_ok = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
case -4:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
skinpos.Message(MSG_ERROR, "Out of memory");
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
model_ok = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
}
break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_HUD:
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto hudpos = scriptfile_getposition(script);
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos frameend;
Fix warnings that appear if big-endian || USE_OPENGL=0. git-svn-id: https://svn.eduke32.com/eduke32@3382 1a8010ca-5511-0410-912e-c29ae57300e0
2013-01-08 06:17:10 +00:00
char happy=1;
int32_t tilex = 0;
Extra files for previous commits git-svn-id: https://svn.eduke32.com/eduke32@4607 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:06:57 +00:00
int32_t ftilenume = -1, ltilenume = -1, flags = 0, fov = -1, angadd = 0;
double xadd = 0.0, yadd = 0.0, zadd = 0.0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist modelhudtokens[] =
{
{ "tile", T_TILE },
{ "tile0", T_TILE0 },
{ "tile1", T_TILE1 },
{ "xadd", T_XADD },
{ "yadd", T_YADD },
{ "zadd", T_ZADD },
{ "angadd", T_ANGADD },
Add custom FOV support for HUD model definitions with the 'fov' DEF token (in build angles). Also adds an r_pr_overridehud cvar in order to preview DEF token changes in-game using the r_pr_hud* cvars. git-svn-id: https://svn.eduke32.com/eduke32@1814 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-01 05:52:33 +00:00
{ "fov", T_FOV },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
{ "hide", T_HIDE },
{ "nobob", T_NOBOB },
{ "flipped",T_FLIPPED},
{ "nodepth",T_NODEPTH},
};
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getbraces(script,&frameend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, frameend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,modelhudtokens,countof(modelhudtokens)))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_TILE:
scriptfile_getsymbol(script,&ftilenume); ltilenume = ftilenume; break;
case T_TILE0:
scriptfile_getsymbol(script,&ftilenume); break; //first tile number
case T_TILE1:
scriptfile_getsymbol(script,&ltilenume); break; //last tile number (inclusive)
case T_XADD:
scriptfile_getdouble(script,&xadd); break;
case T_YADD:
scriptfile_getdouble(script,&yadd); break;
case T_ZADD:
scriptfile_getdouble(script,&zadd); break;
case T_ANGADD:
Extra files for previous commits git-svn-id: https://svn.eduke32.com/eduke32@4607 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:06:57 +00:00
scriptfile_getsymbol(script,&angadd); break;
Add custom FOV support for HUD model definitions with the 'fov' DEF token (in build angles). Also adds an r_pr_overridehud cvar in order to preview DEF token changes in-game using the r_pr_hud* cvars. git-svn-id: https://svn.eduke32.com/eduke32@1814 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-01 05:52:33 +00:00
case T_FOV:
scriptfile_getsymbol(script,&fov); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_HIDE:
Use named enum constants for the HUD flags instead of literal numbers. git-svn-id: https://svn.eduke32.com/eduke32@4174 1a8010ca-5511-0410-912e-c29ae57300e0
2013-11-22 19:26:50 +00:00
flags |= HUDFLAG_HIDE; break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_NOBOB:
Use named enum constants for the HUD flags instead of literal numbers. git-svn-id: https://svn.eduke32.com/eduke32@4174 1a8010ca-5511-0410-912e-c29ae57300e0
2013-11-22 19:26:50 +00:00
flags |= HUDFLAG_NOBOB; break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_FLIPPED:
Use named enum constants for the HUD flags instead of literal numbers. git-svn-id: https://svn.eduke32.com/eduke32@4174 1a8010ca-5511-0410-912e-c29ae57300e0
2013-11-22 19:26:50 +00:00
flags |= HUDFLAG_FLIPPED; break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_NODEPTH:
Use named enum constants for the HUD flags instead of literal numbers. git-svn-id: https://svn.eduke32.com/eduke32@4174 1a8010ca-5511-0410-912e-c29ae57300e0
2013-11-22 19:26:50 +00:00
flags |= HUDFLAG_NODEPTH; break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
}
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile_range("hud", &ftilenume, &ltilenume, script, hudpos))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
model_ok = 0;
break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (lastmodelid < 0)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
hudpos.Message(MSG_WARNING, "Ignoring frame definition.");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
for (tilex = ftilenume; tilex <= ltilenume && happy; tilex++)
{
Engine memory reductions/optimizations: -faketilesiz[MAXTILES] removed in favor of simple faketile[(MAXTILES+7)>>3] bitfield -h_xsize/h_ysize (tile size overrides from .def) are now uint16_t instead of int32_t -hudmem[2][MAXTILES] removed in favor of adding a hudmem ptr to mdmodel_t -tilefromtexture performance improvements -more tsectortype/twalltype usage in various engine functions that read but never write -continued Polymost cleanups and refactors. Please report any odd rendering errors. git-svn-id: https://svn.eduke32.com/eduke32@5079 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-24 00:40:48 +00:00
vec3f_t const add = { (float)xadd, (float)yadd, (float)zadd };
switch (md_definehud(lastmodelid, tilex, add, angadd, flags, fov))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case 0:
break;
case -1:
happy = 0; break; // invalid model id!?
case -2:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
hudpos.Message(MSG_ERROR, "Invalid tile number");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
happy = 0;
break;
case -3:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
hudpos.Message(MSG_ERROR, "Invalid frame name");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
happy = 0;
break;
}
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
model_ok &= happy;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (!model_ok)
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
{
if (lastmodelid >= 0)
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "Removing model %d due to errors.", lastmodelid);
When defining a model with the 'model' token and there were errors, don't let it hang around causing trouble later on; delete it right now and inform the user. Add a couple of 'static's to some functions and file scope data in mdsprite.c git-svn-id: https://svn.eduke32.com/eduke32@2237 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-07 17:48:55 +00:00
md_undefinemodel(lastmodelid);
nextmodelid--;
}
break;
}
Add the 'yoffset' token to model definitions to allow models to compensate for ART tiles with large yoffsets, such as #603. Under normal circumstances the existing 'zadd' parameter should be used instead. Special thanks to Supertanker. git-svn-id: https://svn.eduke32.com/eduke32@2264 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-17 04:31:59 +00:00
md_setmisc(lastmodelid,(float)scale,shadeoffs,(float)mzadd,(float)myoffset,flags);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
modelskin = lastmodelskin = 0;
seenframe = 0;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_VOXEL:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto voxelpos = scriptfile_getposition(script);
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos modelend;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t tile0 = MAXTILES, tile1 = -1, tilex = -1;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist voxeltokens[] =
{
{ "tile", T_TILE },
{ "tile0", T_TILE0 },
{ "tile1", T_TILE1 },
{ "scale", T_SCALE },
Implement rotate parameter for voxel definitions # Conflicts: # source/build/include/build.h # source/build/include/mdsprite.h # source/build/src/defs.cpp
2019-09-17 05:07:28 +00:00
{ "rotate", T_ROTATE },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
};
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (scriptfile_getstring(script,&fn))
A couple of miscellaneous cleanups. defs.c: sync some dup'd code for 'definevoxel' and 'voxel' DEF tokens. engine.c: factor out PolymerProcessModels(). git-svn-id: https://svn.eduke32.com/eduke32@4835 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:52 +00:00
break; //voxel filename
- Blood merge # Conflicts: # source/build/include/polymost.h # source/build/src/build.cpp # source/build/src/engine.cpp # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp
2019-09-19 20:02:45 +00:00
while (nextvoxid < MAXVOXELS && (voxreserve[nextvoxid>>3]&(1<<(nextvoxid&7))))
nextvoxid++;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (nextvoxid == MAXVOXELS)
A couple of miscellaneous cleanups. defs.c: sync some dup'd code for 'definevoxel' and 'voxel' DEF tokens. engine.c: factor out PolymerProcessModels(). git-svn-id: https://svn.eduke32.com/eduke32@4835 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:52 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
voxelpos.Message(MSG_ERROR, "Maximum number of voxels (%d) already defined.", MAXVOXELS);
A couple of miscellaneous cleanups. defs.c: sync some dup'd code for 'definevoxel' and 'voxel' DEF tokens. engine.c: factor out PolymerProcessModels(). git-svn-id: https://svn.eduke32.com/eduke32@4835 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:52 +00:00
break;
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (qloadkvx(nextvoxid, fn))
A couple of miscellaneous cleanups. defs.c: sync some dup'd code for 'definevoxel' and 'voxel' DEF tokens. engine.c: factor out PolymerProcessModels(). git-svn-id: https://svn.eduke32.com/eduke32@4835 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:52 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
voxelpos.Message(MSG_ERROR, "Failure loading voxel file \"%s\"",fn.GetChars());
A couple of miscellaneous cleanups. defs.c: sync some dup'd code for 'definevoxel' and 'voxel' DEF tokens. engine.c: factor out PolymerProcessModels(). git-svn-id: https://svn.eduke32.com/eduke32@4835 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-26 17:29:52 +00:00
break;
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
lastvoxid = nextvoxid++;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getbraces(script,&modelend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, modelend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script, voxeltokens, countof(voxeltokens)))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- use Printf as the only command to print to the console. All uses of OSD_Printf, initprintf etc. have been renamed.
2020-04-11 21:45:45 +00:00
//case T_ERROR: Printf("Error on line %s:%d in voxel tokens\n", script->filename,linenum); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_TILE:
scriptfile_getsymbol(script,&tilex);
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("voxel", tilex, script, voxelpos))
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
break;
tiletovox[tilex] = lastvoxid;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_TILE0:
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
scriptfile_getsymbol(script,&tile0);
break; //1st tile #
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_TILE1:
scriptfile_getsymbol(script,&tile1);
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile_range("voxel", &tile0, &tile1, script, voxelpos))
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
break;
for (tilex=tile0; tilex<=tile1; tilex++)
tiletovox[tilex] = lastvoxid;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break; //last tile number (inclusive)
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
case T_SCALE:
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
double scale=1.0;
scriptfile_getdouble(script,&scale);
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
voxscale[lastvoxid] = (int32_t)(65536*scale);
* Tighter y[ud]most clamping in TROR/classic. This fixes the overdraw bug when standing on the rails in the test map. * Voxel tweaks: horizontally scale wall-aligned ones by 5/4, make them ignore per-tile yoffset in classic (i.e. emulate Polymost; I think this is more sensible since they're not clipped to floors/ceilings anyway), make Polymost know the voxel scale * Always cull back-facing, one-sided, wall-aligned sprites (classic/Polymost), irrespective of whether it's a sprite, voxel or model. This can lead to falsely not drawing them in certain circumstances, but IMO that's preferable to visible hidden switches etc. * Change defaults for r_novoxmips to 1 and lazytileselector to 0 git-svn-id: https://svn.eduke32.com/eduke32@1908 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-18 13:02:08 +00:00
if (voxmodels[lastvoxid])
voxmodels[lastvoxid]->scale = scale;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Implement rotate parameter for voxel definitions # Conflicts: # source/build/include/build.h # source/build/include/mdsprite.h # source/build/src/defs.cpp
2019-09-17 05:07:28 +00:00
case T_ROTATE:
voxrotate[lastvoxid>>3] |= pow2char[lastvoxid&7];
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
lastvoxid = -1;
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_SKYBOX:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto skyboxpos = scriptfile_getposition(script);
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn[6];
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos modelend;
Fix a compiler warning with USE_OPENGL=0. git-svn-id: https://svn.eduke32.com/eduke32@5040 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-08 07:56:29 +00:00
int32_t i, tile = -1, pal = 0, happy = 1;
Moved hightile replacement data into the textures Not tested yet!
2019-10-17 10:45:25 +00:00
int flags = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist skyboxtokens[] =
{
{ "tile" ,T_TILE },
{ "pal" ,T_PAL },
{ "ft" ,T_FRONT },{ "front" ,T_FRONT },{ "forward",T_FRONT },
{ "rt" ,T_RIGHT },{ "right" ,T_RIGHT },
{ "bk" ,T_BACK },{ "back" ,T_BACK },
{ "lf" ,T_LEFT },{ "left" ,T_LEFT },{ "lt" ,T_LEFT },
{ "up" ,T_TOP },{ "top" ,T_TOP },{ "ceiling",T_TOP },{ "ceil" ,T_TOP },
Nocompress and nodownsize for skyboxes git-svn-id: https://svn.eduke32.com/eduke32@5010 1a8010ca-5511-0410-912e-c29ae57300e0
2015-02-18 01:47:00 +00:00
{ "dn" ,T_BOTTOM },{ "bottom" ,T_BOTTOM },{ "floor" ,T_BOTTOM },{ "down" ,T_BOTTOM },
{ "nocompress", T_NOCOMPRESS },
{ "nodownsize", T_NODOWNSIZE },
Defs: Add token "forcefilter" to textures, skyboxes, and model skins. It forces the use of GL filtering for the resource in question. git-svn-id: https://svn.eduke32.com/eduke32@5108 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-28 09:49:37 +00:00
{ "forcefilter", T_FORCEFILTER },
Defs: Add "artquality" subtoken to textures, model skins, and skyboxes, which grants the texture HICR_ARTIMMUNITY. In effect, this implies "nodownsize" and signals that texture compression would be undesirable, but okay using r_texcompr mode 2 (aggressive). git-svn-id: https://svn.eduke32.com/eduke32@5705 1a8010ca-5511-0410-912e-c29ae57300e0
2016-05-02 18:29:35 +00:00
{ "artquality", T_ARTQUALITY },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
};
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getbraces(script,&modelend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, modelend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,skyboxtokens,countof(skyboxtokens)))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- use Printf as the only command to print to the console. All uses of OSD_Printf, initprintf etc. have been renamed.
2020-04-11 21:45:45 +00:00
//case T_ERROR: Printf("Error on line %s:%d in skybox tokens\n",script->filename,linenum); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_TILE:
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
scriptfile_getsymbol(script,&tile); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_PAL:
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
scriptfile_getsymbol(script,&pal); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_FRONT:
scriptfile_getstring(script,&fn[0]); break;
case T_RIGHT:
scriptfile_getstring(script,&fn[1]); break;
case T_BACK:
scriptfile_getstring(script,&fn[2]); break;
case T_LEFT:
scriptfile_getstring(script,&fn[3]); break;
case T_TOP:
scriptfile_getstring(script,&fn[4]); break;
case T_BOTTOM:
scriptfile_getstring(script,&fn[5]); break;
Moved hightile replacement data into the textures Not tested yet!
2019-10-17 10:45:25 +00:00
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (tile < 0) skyboxpos.Message(MSG_ERROR, "skybox: missing 'tile number'"), happy=0;
new version of astyle git-svn-id: https://svn.eduke32.com/eduke32@1229 1a8010ca-5511-0410-912e-c29ae57300e0
2009-02-19 16:47:54 +00:00
for (i=0; i<6; i++)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (fn[i].IsEmpty()) skyboxpos.Message(MSG_ERROR, "skybox: missing '%s filename'", skyfaces[i]), happy = 0;
Fixes former crash in drawline16 and swaps drawpixel with the unsafe variant there; fixes potential sector[-1] access in sliding Star Trek doors; make CC overridable in Makefiles so that other toolchains or static analyzers like scan-build/clang can be used; with its help, fix some issues, some more severe than others. git-svn-id: https://svn.eduke32.com/eduke32@1736 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-17 14:22:15 +00:00
// FIXME?
- fixed bad file checks in defs parser.
2020-09-12 10:39:18 +00:00
if (!fileSystem.FileExists(fn[i]))
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
happy = 0;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (!happy) break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
const char* fns[] = { fn[0].GetChars(), fn[1].GetChars(), fn[2].GetChars(), fn[3].GetChars(), fn[4].GetChars(), fn[5].GetChars() };
tileSetSkybox(tile, pal, fns, flags);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
case T_HIGHPALOOKUP:
{
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
int32_t basepal=-1, pal=-1;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos highpalend;
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
static const tokenlist highpaltokens[] =
{
Hook basepal up to highpal. git-svn-id: https://svn.eduke32.com/eduke32@1782 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-27 07:05:12 +00:00
{ "basepal", T_BASEPAL },
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
{ "pal", T_PAL },
{ "file", T_FILE }
};
if (scriptfile_getbraces(script,&highpalend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, highpalend))
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,highpaltokens,countof(highpaltokens)))
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
{
Hook basepal up to highpal. git-svn-id: https://svn.eduke32.com/eduke32@1782 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-27 07:05:12 +00:00
case T_BASEPAL:
scriptfile_getsymbol(script,&basepal); break;
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
case T_PAL:
scriptfile_getsymbol(script,&pal); break;
case T_FILE:
scriptfile_getstring(script,&fn); break;
}
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)basepal >= MAXBASEPALS)
Hook basepal up to highpal. git-svn-id: https://svn.eduke32.com/eduke32@1782 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-27 07:05:12 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "missing or invalid 'base palette number' for highpalookup definition ");
Hook basepal up to highpal. git-svn-id: https://svn.eduke32.com/eduke32@1782 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-27 07:05:12 +00:00
break;
}
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)pal >= MAXPALOOKUPS - RESERVEDPALS)
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "missing or invalid 'palette number' for highpalookup definition");
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
break;
}
Hook basepal up to highpal. git-svn-id: https://svn.eduke32.com/eduke32@1782 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-27 07:05:12 +00:00
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
if (fn.IsEmpty())
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "missing 'file name' for highpalookup definition");
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
break;
}
Run engine source through new version of astyle, add printf() call to OSD_Printf() to facilitate console access through stdin/stdout for dedicated server mode, minor changes to sdlayer to allow operating without actually initializing SDL git-svn-id: https://svn.eduke32.com/eduke32@1762 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 02:50:27 +00:00
- fixed bad file checks in defs parser.
2020-09-12 10:39:18 +00:00
if (!fileSystem.FileExists(fn))
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
break;
(ATM broken) support for PNG highpal files; their dimensions must be the same as the TGA ones. git-svn-id: https://svn.eduke32.com/eduke32@1749 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-31 01:35:00 +00:00
Highpalookup support is more or less ready, also checked in sample script to generate the highpalookup maps offline (only with a few incomplete pals right now). New DEF token: highpalookup [pal] [filename] New cvar: r_pr_highpalookups git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
}
break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_TINT:
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto tintpos = scriptfile_getposition(script);
New def tokens for "tint": "shadered" or "sr", "shadeblue" or "sb", "shadegreen" or "sg" tint { pal <pal> shadered <0-255> shadegreen <0-255> shadeblue <0-255> } Make shade apply a tint based on the RGB. Default values for shade are zero (black). Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6557 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:58 +00:00
int32_t red=255, green=255, blue=255, shadered=0, shadegreen=0, shadeblue=0, pal=-1, flags=0;
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos tintend;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist tinttokens[] =
{
New def tokens for "tint": "shadered" or "sr", "shadeblue" or "sb", "shadegreen" or "sg" tint { pal <pal> shadered <0-255> shadegreen <0-255> shadeblue <0-255> } Make shade apply a tint based on the RGB. Default values for shade are zero (black). Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6557 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:58 +00:00
{ "pal", T_PAL },
{ "red", T_RED },{ "r", T_RED },
{ "green", T_GREEN },{ "g", T_GREEN },
{ "blue", T_BLUE },{ "b", T_BLUE },
{ "shadered", T_SHADERED },{ "sr", T_SHADERED },
{ "shadegreen", T_SHADEGREEN },{ "sg", T_SHADEGREEN },
{ "shadeblue", T_SHADEBLUE },{ "sb", T_SHADEBLUE },
{ "flags", T_FLAGS }
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
};
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getbraces(script,&tintend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, tintend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,tinttokens,countof(tinttokens)))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_PAL:
New def tokens for "tint": "shadered" or "sr", "shadeblue" or "sb", "shadegreen" or "sg" tint { pal <pal> shadered <0-255> shadegreen <0-255> shadeblue <0-255> } Make shade apply a tint based on the RGB. Default values for shade are zero (black). Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6557 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:58 +00:00
scriptfile_getsymbol(script,&pal); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_RED:
New def tokens for "tint": "shadered" or "sr", "shadeblue" or "sb", "shadegreen" or "sg" tint { pal <pal> shadered <0-255> shadegreen <0-255> shadeblue <0-255> } Make shade apply a tint based on the RGB. Default values for shade are zero (black). Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6557 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:58 +00:00
scriptfile_getnumber(script,&red); red = min(255,max(0,red)); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_GREEN:
New def tokens for "tint": "shadered" or "sr", "shadeblue" or "sb", "shadegreen" or "sg" tint { pal <pal> shadered <0-255> shadegreen <0-255> shadeblue <0-255> } Make shade apply a tint based on the RGB. Default values for shade are zero (black). Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6557 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:58 +00:00
scriptfile_getnumber(script,&green); green = min(255,max(0,green)); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_BLUE:
New def tokens for "tint": "shadered" or "sr", "shadeblue" or "sb", "shadegreen" or "sg" tint { pal <pal> shadered <0-255> shadegreen <0-255> shadeblue <0-255> } Make shade apply a tint based on the RGB. Default values for shade are zero (black). Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6557 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:58 +00:00
scriptfile_getnumber(script,&blue); blue = min(255,max(0,blue)); break;
case T_SHADERED:
scriptfile_getnumber(script,&shadered); shadered = min(255,max(0,shadered)); break;
case T_SHADEGREEN:
scriptfile_getnumber(script,&shadegreen); shadegreen = min(255,max(0,shadegreen)); break;
case T_SHADEBLUE:
scriptfile_getnumber(script,&shadeblue); shadeblue = min(255,max(0,shadeblue)); break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_FLAGS:
New def tokens for "tint": "shadered" or "sr", "shadeblue" or "sb", "shadegreen" or "sg" tint { pal <pal> shadered <0-255> shadegreen <0-255> shadeblue <0-255> } Make shade apply a tint based on the RGB. Default values for shade are zero (black). Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6557 1a8010ca-5511-0410-912e-c29ae57300e0
2017-12-12 05:13:58 +00:00
scriptfile_getsymbol(script,&flags); break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (pal < 0)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
tintpos.Message(MSG_ERROR, "tint: missing 'palette number'");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
- moved hictinting data into the lookup tables.
2020-05-29 18:15:42 +00:00
lookups.setPaletteTint(pal,red,green,blue,shadered,shadegreen,shadeblue,flags);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
case T_MAKEPALOOKUP:
{
int32_t red=0, green=0, blue=0, pal=-1;
int32_t havepal=0, remappal=0;
Defs: Add "nofloorpal <value>" to "makepalookup", which, when specified, allows you to set exactly the value of g_noFloorPal that you want. git-svn-id: https://svn.eduke32.com/eduke32@5101 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-27 12:29:52 +00:00
int32_t nofloorpal=-1;
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos endtextptr;
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
static const tokenlist palookuptokens[] =
{
{ "pal", T_PAL },
{ "red", T_RED }, { "r", T_RED },
{ "green", T_GREEN }, { "g", T_GREEN },
{ "blue", T_BLUE }, { "b", T_BLUE },
{ "remappal", T_REMAPPAL },
{ "remapself", T_REMAPSELF },
Defs: Add "nofloorpal <value>" to "makepalookup", which, when specified, allows you to set exactly the value of g_noFloorPal that you want. git-svn-id: https://svn.eduke32.com/eduke32@5101 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-27 12:29:52 +00:00
{ "nofloorpal", T_NOFLOORPAL },
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
};
DEF: fix handling of 'remappal' attribute for 'makepalookup'. git-svn-id: https://svn.eduke32.com/eduke32@4813 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:06 +00:00
enum {
HAVE_PAL = 1,
HAVE_REMAPPAL = 2,
HAVE_REMAPSELF = 4,
HAVEPAL_SPECIAL = HAVE_REMAPPAL | HAVE_REMAPSELF,
HAVEPAL_ERROR = 8,
};
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
if (scriptfile_getbraces(script,&endtextptr)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, endtextptr))
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script, palookuptokens, countof(palookuptokens)))
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
{
case T_PAL:
scriptfile_getsymbol(script, &pal);
DEF: fix handling of 'remappal' attribute for 'makepalookup'. git-svn-id: https://svn.eduke32.com/eduke32@4813 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:06 +00:00
havepal |= HAVE_PAL;
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
break;
case T_RED:
scriptfile_getnumber(script,&red);
red = clamp(red, 0, 63);
break;
case T_GREEN:
scriptfile_getnumber(script,&green);
green = clamp(green, 0, 63);
break;
case T_BLUE:
scriptfile_getnumber(script,&blue);
blue = clamp(blue, 0, 63);
break;
case T_REMAPPAL:
scriptfile_getsymbol(script,&remappal);
DEF: fix handling of 'remappal' attribute for 'makepalookup'. git-svn-id: https://svn.eduke32.com/eduke32@4813 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:06 +00:00
if (havepal & HAVEPAL_SPECIAL)
havepal |= HAVEPAL_ERROR;
havepal |= HAVE_REMAPPAL;
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
break;
case T_REMAPSELF:
DEF: fix handling of 'remappal' attribute for 'makepalookup'. git-svn-id: https://svn.eduke32.com/eduke32@4813 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:06 +00:00
if (havepal & HAVEPAL_SPECIAL)
havepal |= HAVEPAL_ERROR;
havepal |= HAVE_REMAPSELF;
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
break;
Defs: Add "nofloorpal <value>" to "makepalookup", which, when specified, allows you to set exactly the value of g_noFloorPal that you want. git-svn-id: https://svn.eduke32.com/eduke32@5101 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-27 12:29:52 +00:00
case T_NOFLOORPAL:
scriptfile_getsymbol(script, &nofloorpal);
nofloorpal = clamp(nofloorpal, 0, 1);
break;
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
}
}
{
char msgend[BMAX_PATH+64];
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
sprintf(msgend, "for palookup definition");
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((havepal & HAVE_PAL)==0)
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "missing 'palette number' %s\n", msgend);
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
break;
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
else if (pal==0 || (unsigned)pal >= MAXPALOOKUPS-RESERVEDPALS)
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "'palette number' out of range (1 .. %d) %s\n",
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
MAXPALOOKUPS-RESERVEDPALS-1, msgend);
break;
}
DEF: fix handling of 'remappal' attribute for 'makepalookup'. git-svn-id: https://svn.eduke32.com/eduke32@4813 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:06 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (havepal & HAVEPAL_ERROR)
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
{
// will also disallow multiple remappals or remapselfs
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "must have exactly one of either 'remappal' or 'remapself' %s\n", msgend);
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
break;
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
else if ((havepal & HAVE_REMAPPAL
DEF: fix handling of 'remappal' attribute for 'makepalookup'. git-svn-id: https://svn.eduke32.com/eduke32@4813 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:06 +00:00
&& (unsigned)remappal >= MAXPALOOKUPS-RESERVEDPALS))
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "'remap palette number' out of range (max=%d) %s\n",
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
MAXPALOOKUPS-RESERVEDPALS-1, msgend);
break;
}
DEF: fix handling of 'remappal' attribute for 'makepalookup'. git-svn-id: https://svn.eduke32.com/eduke32@4813 1a8010ca-5511-0410-912e-c29ae57300e0
2014-12-13 22:33:06 +00:00
if (havepal & HAVE_REMAPSELF)
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
remappal = pal;
}
// NOTE: all palookups are initialized, i.e. non-NULL!
// NOTE2: aliasing (pal==remappal) is OK
- palette code cleanup.
2020-05-27 20:19:02 +00:00
lookups.makeTable(pal, lookups.getTable(remappal), red<<2, green<<2, blue<<2,
remappal==0 ? 1 : (nofloorpal == -1 ? lookups.tables[remappal].noFloorPal : nofloorpal));
DEF command 'makepalookup', allowing indpt. specification of fog and color remapping. The syntax is as follows: makepalookup { <token-list...> } where valid tokens are * pal <palnum>: the palette number, 1 .. 250 * red <num>, green, blue (or r, g, b): the fog color components on a 0 to 63 scale. Components that are not present are assumed to be 0. * remappal <palnum>: the palette number to take the index remapping from, i.e. 21 for blue -> red. When absent, defaults to 0. * remapself: when present, specifies that the remappal is the same as the 'pal'. This is to prevent textual redundancy when overwriting existing palookups. Examples (best tested with tile #251): 1) makepalookup { pal 200 red 30 remappal 23 } This creates palookup 200 with a fog of (30,0,0) and a blue-to-yellow remapping (assuming it has not been changed before) 2) makepalookup { pal 21 red 30 remapself } This 'fogifies' palookup 21 with a red fog. 3) makepalookup { pal 21 red 30 } This overwrites palookup 21 with a red fog, but clears the blue-to-red remapping. The fog aspect of this command affects the GL modes just like 'fogpal', but the remapping has no effect for hightiles. - Also, silently clamp 'fogpal' r,g,b values to the range 0 .. 63. git-svn-id: https://svn.eduke32.com/eduke32@2568 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-29 21:16:41 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_TEXTURE:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos textureend;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t tile=-1, token;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist texturetokens[] =
{
{ "pal", T_PAL },
{ "detail", T_DETAIL },
{ "glow", T_GLOW },
{ "specular",T_SPECULAR },
{ "normal", T_NORMAL },
};
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getsymbol(script,&tile)) break;
if (scriptfile_getbraces(script,&textureend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, textureend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
token = getatoken(script,texturetokens,countof(texturetokens));
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
switch (token)
{
case T_PAL:
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto palpos = scriptfile_getposition(script);
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos palend;
Add support for "orig_sizex" and "orig_sizey" parameters to "texture" block in def files. This is the same as using "dummytile" before defining a texture. Needed for compatibility with the .def files from Megaton, not because I like arbitrarily adding extranneous shit. :p git-svn-id: https://svn.eduke32.com/eduke32@4062 1a8010ca-5511-0410-912e-c29ae57300e0
2013-09-14 17:58:46 +00:00
int32_t pal=-1, xsiz = 0, ysiz = 0;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
Fix specpower and specfactor definitions for diffuse maps. git-svn-id: https://svn.eduke32.com/eduke32@1526 1a8010ca-5511-0410-912e-c29ae57300e0
2009-10-04 15:41:40 +00:00
double alphacut = -1.0, xscale = 1.0, yscale = 1.0, specpower = 1.0, specfactor = 1.0;
Moved hightile replacement data into the textures Not tested yet!
2019-10-17 10:45:25 +00:00
uint8_t flags = 0;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist texturetokens_pal[] =
{
{ "file", T_FILE },{ "name", T_FILE },
{ "alphacut", T_ALPHACUT },
{ "detailscale", T_XSCALE }, { "scale", T_XSCALE }, { "xscale", T_XSCALE }, { "intensity", T_XSCALE },
{ "yscale", T_YSCALE },
Add "specularpower" and "specularfactor" as synonyms of "specpower" and "specfactor" respectively. git-svn-id: https://svn.eduke32.com/eduke32@2539 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-26 05:06:31 +00:00
{ "specpower", T_SPECPOWER }, { "specularpower", T_SPECPOWER }, { "parallaxscale", T_SPECPOWER },
{ "specfactor", T_SPECFACTOR }, { "specularfactor", T_SPECFACTOR }, { "parallaxbias", T_SPECFACTOR },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
{ "nocompress", T_NOCOMPRESS },
{ "nodownsize", T_NODOWNSIZE },
Defs: Add token "forcefilter" to textures, skyboxes, and model skins. It forces the use of GL filtering for the resource in question. git-svn-id: https://svn.eduke32.com/eduke32@5108 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-28 09:49:37 +00:00
{ "forcefilter", T_FORCEFILTER },
Defs: Add "artquality" subtoken to textures, model skins, and skyboxes, which grants the texture HICR_ARTIMMUNITY. In effect, this implies "nodownsize" and signals that texture compression would be undesirable, but okay using r_texcompr mode 2 (aggressive). git-svn-id: https://svn.eduke32.com/eduke32@5705 1a8010ca-5511-0410-912e-c29ae57300e0
2016-05-02 18:29:35 +00:00
{ "artquality", T_ARTQUALITY },
Add support for "orig_sizex" and "orig_sizey" parameters to "texture" block in def files. This is the same as using "dummytile" before defining a texture. Needed for compatibility with the .def files from Megaton, not because I like arbitrarily adding extranneous shit. :p git-svn-id: https://svn.eduke32.com/eduke32@4062 1a8010ca-5511-0410-912e-c29ae57300e0
2013-09-14 17:58:46 +00:00
{ "orig_sizex", T_ORIGSIZEX }, { "orig_sizey", T_ORIGSIZEY }
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
};
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getsymbol(script,&pal)) break;
if (scriptfile_getbraces(script,&palend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, palend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,texturetokens_pal,countof(texturetokens_pal)))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
case T_FILE:
scriptfile_getstring(script,&fn); break;
case T_ALPHACUT:
scriptfile_getdouble(script,&alphacut); break;
Added xscale and yscale DEF tokens to texture blocks to control the size ratio with the ART. git-svn-id: https://svn.eduke32.com/eduke32@504 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-17 02:23:50 +00:00
case T_XSCALE:
scriptfile_getdouble(script,&xscale); break;
case T_YSCALE:
scriptfile_getdouble(script,&yscale); break;
Fix specpower and specfactor definitions for diffuse maps. git-svn-id: https://svn.eduke32.com/eduke32@1526 1a8010ca-5511-0410-912e-c29ae57300e0
2009-10-04 15:41:40 +00:00
case T_SPECPOWER:
scriptfile_getdouble(script,&specpower); break;
case T_SPECFACTOR:
scriptfile_getdouble(script,&specfactor); break;
Add support for "orig_sizex" and "orig_sizey" parameters to "texture" block in def files. This is the same as using "dummytile" before defining a texture. Needed for compatibility with the .def files from Megaton, not because I like arbitrarily adding extranneous shit. :p git-svn-id: https://svn.eduke32.com/eduke32@4062 1a8010ca-5511-0410-912e-c29ae57300e0
2013-09-14 17:58:46 +00:00
case T_ORIGSIZEX:
scriptfile_getnumber(script, &xsiz);
break;
case T_ORIGSIZEY:
scriptfile_getnumber(script, &ysiz);
break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
default:
break;
}
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)tile >= MAXUSERTILES) break; // message is printed later
if ((unsigned)pal >= MAXPALOOKUPS - RESERVEDPALS)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
palpos.Message(MSG_ERROR, "missing or invalid 'palette number' for texture definition");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
if (fn.IsEmpty())
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
palpos.Message(MSG_ERROR, "missing 'file name' for texture definition");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Speed up HRP loading git-svn-id: https://svn.eduke32.com/eduke32@543 1a8010ca-5511-0410-912e-c29ae57300e0
2007-04-30 19:41:19 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (!fileSystem.FileExists(fn))
- fixed setup of hires textures. File check was accidentally inverted.
2020-01-28 20:35:46 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
palpos.Message(MSG_ERROR, "%s not found in replacement for tile %d", fn.GetChars(), tile);
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
break;
- fixed setup of hires textures. File check was accidentally inverted.
2020-01-28 20:35:46 +00:00
}
bleh git-svn-id: https://svn.eduke32.com/eduke32@544 1a8010ca-5511-0410-912e-c29ae57300e0
2007-05-01 04:35:27 +00:00
Add support for "orig_sizex" and "orig_sizey" parameters to "texture" block in def files. This is the same as using "dummytile" before defining a texture. Needed for compatibility with the .def files from Megaton, not because I like arbitrarily adding extranneous shit. :p git-svn-id: https://svn.eduke32.com/eduke32@4062 1a8010ca-5511-0410-912e-c29ae57300e0
2013-09-14 17:58:46 +00:00
if (xsiz > 0 && ysiz > 0)
{
- tileDelete / tileSetDummy
2019-10-15 21:29:47 +00:00
tileSetDummy(tile, xsiz, ysiz);
Add support for "orig_sizex" and "orig_sizey" parameters to "texture" block in def files. This is the same as using "dummytile" before defining a texture. Needed for compatibility with the .def files from Megaton, not because I like arbitrarily adding extranneous shit. :p git-svn-id: https://svn.eduke32.com/eduke32@4062 1a8010ca-5511-0410-912e-c29ae57300e0
2013-09-14 17:58:46 +00:00
}
Added xscale and yscale DEF tokens to texture blocks to control the size ratio with the ART. git-svn-id: https://svn.eduke32.com/eduke32@504 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-17 02:23:50 +00:00
xscale = 1.0f / xscale;
yscale = 1.0f / yscale;
Moved hightile replacement data into the textures Not tested yet!
2019-10-17 10:45:25 +00:00
tileSetHightileReplacement(tile,pal,fn,alphacut,xscale,yscale, specpower, specfactor,flags);
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
}
break;
Modified priority system to use 6 priority levels instead of 3, added proper def syntax "specular" and "normal" which work identically to "detail" and "glow" for defining normals and specular maps (defining these with pals 100 and 101 will no longer work) git-svn-id: https://svn.eduke32.com/eduke32@1350 1a8010ca-5511-0410-912e-c29ae57300e0
2009-04-28 22:56:43 +00:00
case T_DETAIL: case T_GLOW: case T_SPECULAR: case T_NORMAL:
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
auto detailpos = scriptfile_getposition(script);
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos detailend;
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
int32_t pal = 0;
Fix warnings that appear if big-endian || USE_OPENGL=0. git-svn-id: https://svn.eduke32.com/eduke32@3382 1a8010ca-5511-0410-912e-c29ae57300e0
2013-01-08 06:17:10 +00:00
char flags = 0;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
Modified priority system to use 6 priority levels instead of 3, added proper def syntax "specular" and "normal" which work identically to "detail" and "glow" for defining normals and specular maps (defining these with pals 100 and 101 will no longer work) git-svn-id: https://svn.eduke32.com/eduke32@1350 1a8010ca-5511-0410-912e-c29ae57300e0
2009-04-28 22:56:43 +00:00
double xscale = 1.0, yscale = 1.0, specpower = 1.0, specfactor = 1.0;
Detail mapping : r_detailmapping. git-svn-id: https://svn.eduke32.com/eduke32@459 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-15 09:08:57 +00:00
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist texturetokens_pal[] =
{
{ "file", T_FILE },{ "name", T_FILE },
{ "alphacut", T_ALPHACUT },
{ "detailscale", T_XSCALE }, { "scale", T_XSCALE }, { "xscale", T_XSCALE }, { "intensity", T_XSCALE },
{ "yscale", T_YSCALE },
Add "specularpower" and "specularfactor" as synonyms of "specpower" and "specfactor" respectively. git-svn-id: https://svn.eduke32.com/eduke32@2539 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-26 05:06:31 +00:00
{ "specpower", T_SPECPOWER }, { "specularpower", T_SPECPOWER }, { "parallaxscale", T_SPECPOWER },
{ "specfactor", T_SPECFACTOR }, { "specularfactor", T_SPECFACTOR }, { "parallaxbias", T_SPECFACTOR },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
{ "nocompress", T_NOCOMPRESS },
{ "nodownsize", T_NODOWNSIZE },
Defs: Add token "forcefilter" to textures, skyboxes, and model skins. It forces the use of GL filtering for the resource in question. git-svn-id: https://svn.eduke32.com/eduke32@5108 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-28 09:49:37 +00:00
{ "forcefilter", T_FORCEFILTER },
Defs: Add "artquality" subtoken to textures, model skins, and skyboxes, which grants the texture HICR_ARTIMMUNITY. In effect, this implies "nodownsize" and signals that texture compression would be undesirable, but okay using r_texcompr mode 2 (aggressive). git-svn-id: https://svn.eduke32.com/eduke32@5705 1a8010ca-5511-0410-912e-c29ae57300e0
2016-05-02 18:29:35 +00:00
{ "artquality", T_ARTQUALITY },
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
};
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (scriptfile_getbraces(script,&detailend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, detailend))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,texturetokens_pal,countof(texturetokens_pal)))
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
Detail mapping : r_detailmapping. git-svn-id: https://svn.eduke32.com/eduke32@459 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-15 09:08:57 +00:00
case T_FILE:
scriptfile_getstring(script,&fn); break;
Added xscale and yscale DEF tokens to texture blocks to control the size ratio with the ART. git-svn-id: https://svn.eduke32.com/eduke32@504 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-17 02:23:50 +00:00
case T_XSCALE:
Detail map scaling. git-svn-id: https://svn.eduke32.com/eduke32@512 1a8010ca-5511-0410-912e-c29ae57300e0
2007-03-01 18:19:11 +00:00
scriptfile_getdouble(script,&xscale); break;
case T_YSCALE:
scriptfile_getdouble(script,&yscale); break;
Modified priority system to use 6 priority levels instead of 3, added proper def syntax "specular" and "normal" which work identically to "detail" and "glow" for defining normals and specular maps (defining these with pals 100 and 101 will no longer work) git-svn-id: https://svn.eduke32.com/eduke32@1350 1a8010ca-5511-0410-912e-c29ae57300e0
2009-04-28 22:56:43 +00:00
case T_SPECPOWER:
scriptfile_getdouble(script,&specpower); break;
case T_SPECFACTOR:
scriptfile_getdouble(script,&specfactor); break;
Detail mapping : r_detailmapping. git-svn-id: https://svn.eduke32.com/eduke32@459 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-15 09:08:57 +00:00
default:
break;
}
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)tile >= MAXUSERTILES) break; // message is printed later
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
if (fn.IsEmpty())
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
detailpos.Message(MSG_ERROR, "missing 'file name' for texture definition");
Detail mapping : r_detailmapping. git-svn-id: https://svn.eduke32.com/eduke32@459 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-15 09:08:57 +00:00
break;
}
Speed up HRP loading git-svn-id: https://svn.eduke32.com/eduke32@543 1a8010ca-5511-0410-912e-c29ae57300e0
2007-04-30 19:41:19 +00:00
- fixed bad file checks in defs parser.
2020-09-12 10:39:18 +00:00
if (!fileSystem.FileExists(fn))
Factor out eleven (!) instances of identical code into check_file_exist(). git-svn-id: https://svn.eduke32.com/eduke32@2554 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-28 19:41:39 +00:00
break;
Detail mapping : r_detailmapping. git-svn-id: https://svn.eduke32.com/eduke32@459 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-15 09:08:57 +00:00
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
switch (token)
Various fixes and detail texturing on models. git-svn-id: https://svn.eduke32.com/eduke32@501 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 01:34:41 +00:00
{
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
case T_DETAIL:
Various fixes and detail texturing on models. git-svn-id: https://svn.eduke32.com/eduke32@501 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 01:34:41 +00:00
pal = DETAILPAL;
Detail map scaling. git-svn-id: https://svn.eduke32.com/eduke32@512 1a8010ca-5511-0410-912e-c29ae57300e0
2007-03-01 18:19:11 +00:00
xscale = 1.0f / xscale;
Corrected issues with detailmaps scaling, improved general model drawing performance and added support for using vertex arrays when drawing models (r_vertexarrays) git-svn-id: https://svn.eduke32.com/eduke32@513 1a8010ca-5511-0410-912e-c29ae57300e0
2007-03-03 23:09:40 +00:00
yscale = 1.0f / yscale;
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
break;
case T_GLOW:
Various fixes and detail texturing on models. git-svn-id: https://svn.eduke32.com/eduke32@501 1a8010ca-5511-0410-912e-c29ae57300e0
2007-02-16 01:34:41 +00:00
pal = GLOWPAL;
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
break;
Modified priority system to use 6 priority levels instead of 3, added proper def syntax "specular" and "normal" which work identically to "detail" and "glow" for defining normals and specular maps (defining these with pals 100 and 101 will no longer work) git-svn-id: https://svn.eduke32.com/eduke32@1350 1a8010ca-5511-0410-912e-c29ae57300e0
2009-04-28 22:56:43 +00:00
case T_SPECULAR:
pal = SPECULARPAL;
break;
case T_NORMAL:
pal = NORMALPAL;
break;
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
}
Moved hightile replacement data into the textures Not tested yet!
2019-10-17 10:45:25 +00:00
tileSetHightileReplacement(tile,pal,fn,-1.0f,xscale,yscale, specpower, specfactor,flags);
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
}
break;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
default:
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
break;
}
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)tile >= MAXUSERTILES)
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "missing or invalid 'tile number' for texture definition");
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_UNDEFMODEL:
case T_UNDEFMODELRANGE:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t r0,r1;
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (scriptfile_getsymbol(script,&r0)) break;
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
if (tokn == T_UNDEFMODELRANGE)
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (scriptfile_getsymbol(script,&r1)) break;
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile_range("undefmodelrange", &r0, &r1, script, pos))
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
}
else
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
r1 = r0;
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("undefmodel", r0, script, pos))
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
}
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
for (; r0 <= r1; r0++)
md_undefinetile(r0);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_UNDEFMODELOF:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
int32_t r0;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (scriptfile_getsymbol(script,&r0)) break;
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("undefmodelof", r0, script, pos))
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
// XXX: See comment of md_undefinemodel()
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_WARNING, "undefmodelof: currently non-functional.");
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
break;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Address a number of harmless instances of "code never reached" identified by Xcode. git-svn-id: https://svn.eduke32.com/eduke32@5961 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:06 +00:00
#if defined USE_OPENGL && 0
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
mid = md_tilehasmodel(r0,0);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
if (mid < 0) break;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
md_undefinemodel(mid);
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
#endif
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
case T_UNDEFTEXTURE:
case T_UNDEFTEXTURERANGE:
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
{
Fix warnings that appear if big-endian || USE_OPENGL=0. git-svn-id: https://svn.eduke32.com/eduke32@3382 1a8010ca-5511-0410-912e-c29ae57300e0
2013-01-08 06:17:10 +00:00
int32_t r0,r1;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (scriptfile_getsymbol(script,&r0)) break;
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
if (tokn == T_UNDEFTEXTURERANGE)
{
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (scriptfile_getsymbol(script,&r1)) break;
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile_range("undeftexturerange", &r0, &r1, script, pos))
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-12 17:42:14 +00:00
}
else
{
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
r1 = r0;
Big clean up in defs.c and related content. The usual stuff... - factor out many identical checks in a convenient function; some messages may read slightly differently now and tile ranges may be handled more strictly (error out if one of the limits is invalid) - factor out two instances of identical (up to one arg) code into tile_from_truecolpic - factor out setting picsiz[] and stuff into set_picsizanm - some checks - Make "undefmodelof" non-functional and warn. - in "animtilerange", if the tile difference is >= 64, error out since we can't store it in picanm[] git-svn-id: https://svn.eduke32.com/eduke32@2588 1a8010ca-5511-0410-912e-c29ae57300e0
2012-04-04 18:58:19 +00:00
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
if (check_tile("undeftexture", r0, script, pos))
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
Moved hightile replacement data into the textures Not tested yet!
2019-10-17 10:45:25 +00:00
for (; r0 <= r1; r0++) tileRemoveReplacement(r0);
Formatting change git-svn-id: https://svn.eduke32.com/eduke32@331 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-13 23:12:47 +00:00
}
break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
Animation system overhaul part 1. This allows for an unlimited number of .anm/.ivf files to be defined via duke3d.def and played back at any time with the new CON commands. Syntax is currently as follows, but may change: cutscene "somefile.anm" { delay 10 } // defines somefile.anm with a delay of 10 120Hz tics between frames. a more typical framerate method may come later, but this is how the originals worked. Once defined, they can be played through CON with the new playback command, also called "cutscene". It works like this: definequote 12345 somefile.anm define ANIM_SOMEFILE 12345 ... cutscene ANIM_SOMEFILE // halts game execution and immediately plays cutscene, resuming execution when finished ... Sounds can be played during animations (and tiles can be overlaid, etc) like this: onevent EVENT_CUTSCENE ifcutscene ANIM_SOMEFILE { ifvare RETURN 12 // frame 12 sound FLY_BY rotatesprite ... } endevent The value of the RETURN var at the end of EVENT_CUTSCENE determines the next frame to play. This can be used for looping, etc. Attempting to play animations backwards outright is not advised as animations only seek in one direction (so rewinding requires running it through from frame 0 again). This is will WIP and hasn't been heavily tested at all, so please try it out. git-svn-id: https://svn.eduke32.com/eduke32@4987 1a8010ca-5511-0410-912e-c29ae57300e0
2015-02-11 05:22:07 +00:00
case T_CUTSCENE:
Possibility of specifying sounds for a VPX anim-replacement via DEF. The syntax is as follows: animsounds <anim> { frame1 sound1 frame2 sound2 ... } <anim> has to be one of the tokens: cineov2, cineov3, RADLOGO, DUKETEAM, logo, vol41a, vol42a, vol4e1, vol43a, vol4e2, or vol4e3, corresponding to hard-coded Duke3D anims. The frameN's (1-based frame numbers) have to be in ascending order (but not necessarily strictly ascending, so that a frame may have more than one sound). Example: for Duke3D's XBLA nuke logo animation (IVF extracted from nuke.webm), the following definition overlays the video with a sound sequence similar (identical save for timing) to the original nuke animation: // frame 1: FLY_BY, frame 64: PIPEBOMB_EXPLODE animsounds logo { 1 244 64 14 } git-svn-id: https://svn.eduke32.com/eduke32@2242 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-10 23:43:54 +00:00
case T_ANIMSOUNDS:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos dummy;
Possibility of specifying sounds for a VPX anim-replacement via DEF. The syntax is as follows: animsounds <anim> { frame1 sound1 frame2 sound2 ... } <anim> has to be one of the tokens: cineov2, cineov3, RADLOGO, DUKETEAM, logo, vol41a, vol42a, vol4e1, vol43a, vol4e2, or vol4e3, corresponding to hard-coded Duke3D anims. The frameN's (1-based frame numbers) have to be in ascending order (but not necessarily strictly ascending, so that a frame may have more than one sound). Example: for Duke3D's XBLA nuke logo animation (IVF extracted from nuke.webm), the following definition overlays the video with a sound sequence similar (identical save for timing) to the original nuke animation: // frame 1: FLY_BY, frame 64: PIPEBOMB_EXPLODE animsounds logo { 1 244 64 14 } git-svn-id: https://svn.eduke32.com/eduke32@2242 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-10 23:43:54 +00:00
static const tokenlist dummytokens[] = { { "id", T_ID }, };
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
if (scriptfile_getstring(script, nullptr)) break;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (scriptfile_getbraces(script,&dummy)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, dummy))
Possibility of specifying sounds for a VPX anim-replacement via DEF. The syntax is as follows: animsounds <anim> { frame1 sound1 frame2 sound2 ... } <anim> has to be one of the tokens: cineov2, cineov3, RADLOGO, DUKETEAM, logo, vol41a, vol42a, vol4e1, vol43a, vol4e2, or vol4e3, corresponding to hard-coded Duke3D anims. The frameN's (1-based frame numbers) have to be in ascending order (but not necessarily strictly ascending, so that a frame may have more than one sound). Example: for Duke3D's XBLA nuke logo animation (IVF extracted from nuke.webm), the following definition overlays the video with a sound sequence similar (identical save for timing) to the original nuke animation: // frame 1: FLY_BY, frame 64: PIPEBOMB_EXPLODE animsounds logo { 1 244 64 14 } git-svn-id: https://svn.eduke32.com/eduke32@2242 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-10 23:43:54 +00:00
{
// XXX?
getatoken(script,dummytokens,sizeof(dummytokens)/sizeof(dummytokens));
}
}
break;
Texel-granular hitscan() for wall-aligned sprites. The attribute is set per tile from DEF: either texhitscanrange <begintile> <endtile> or tilefromtexture <tile> { ... texhitscan ... } (As a special case, the list may only contain "texhitscan", in which case the texture is not changed.) In passing, do some cleanup for "tilefromtexture" DEF parsing: the list tokens should now be accepted in any order, and errors don't appear in the middle of the list parsing. git-svn-id: https://svn.eduke32.com/eduke32@3078 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-14 20:41:34 +00:00
case T_TEXHITSCANRANGE:
Expose per-tile nofullbright bit (GL modes only) to DEF. The attribute is set per tile from DEF: either nofullbrightrange <begintile> <endtile> or tilefromtexture <tile> { ... nofullbright ... } As a special case, the list may only contain "nofullbright", in which case the texture is not changed. (This is analogous to "texhitscan".) Example: // make piggy's eyes fullbright red only when it fires the shotgun nofullbrightrange 2000 2034 nofullbrightrange 2040 2049 nofullbrightrange 2055 2061 git-svn-id: https://svn.eduke32.com/eduke32@3230 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-25 13:19:06 +00:00
case T_NOFULLBRIGHTRANGE:
Texel-granular hitscan() for wall-aligned sprites. The attribute is set per tile from DEF: either texhitscanrange <begintile> <endtile> or tilefromtexture <tile> { ... texhitscan ... } (As a special case, the list may only contain "texhitscan", in which case the texture is not changed.) In passing, do some cleanup for "tilefromtexture" DEF parsing: the list tokens should now be accepted in any order, and errors don't appear in the middle of the list parsing. git-svn-id: https://svn.eduke32.com/eduke32@3078 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-14 20:41:34 +00:00
{
int32_t b,e, i;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (scriptfile_getsymbol(script,&b)) break;
if (scriptfile_getsymbol(script,&e))break;
Texel-granular hitscan() for wall-aligned sprites. The attribute is set per tile from DEF: either texhitscanrange <begintile> <endtile> or tilefromtexture <tile> { ... texhitscan ... } (As a special case, the list may only contain "texhitscan", in which case the texture is not changed.) In passing, do some cleanup for "tilefromtexture" DEF parsing: the list tokens should now be accepted in any order, and errors don't appear in the middle of the list parsing. git-svn-id: https://svn.eduke32.com/eduke32@3078 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-14 20:41:34 +00:00
b = max(b, 0);
Reserve 16 tiles from the end of MAXTILES, don't allow as user tiles from ART/DEF. git-svn-id: https://svn.eduke32.com/eduke32@4225 1a8010ca-5511-0410-912e-c29ae57300e0
2013-12-28 17:04:22 +00:00
e = min(e, MAXUSERTILES-1);
Texel-granular hitscan() for wall-aligned sprites. The attribute is set per tile from DEF: either texhitscanrange <begintile> <endtile> or tilefromtexture <tile> { ... texhitscan ... } (As a special case, the list may only contain "texhitscan", in which case the texture is not changed.) In passing, do some cleanup for "tilefromtexture" DEF parsing: the list tokens should now be accepted in any order, and errors don't appear in the middle of the list parsing. git-svn-id: https://svn.eduke32.com/eduke32@3078 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-14 20:41:34 +00:00
for (i=b; i<=e; i++)
Expose per-tile nofullbright bit (GL modes only) to DEF. The attribute is set per tile from DEF: either nofullbrightrange <begintile> <endtile> or tilefromtexture <tile> { ... nofullbright ... } As a special case, the list may only contain "nofullbright", in which case the texture is not changed. (This is analogous to "texhitscan".) Example: // make piggy's eyes fullbright red only when it fires the shotgun nofullbrightrange 2000 2034 nofullbrightrange 2040 2049 nofullbrightrange 2055 2061 git-svn-id: https://svn.eduke32.com/eduke32@3230 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-25 13:19:06 +00:00
picanm[i].sf |= (tokn==T_TEXHITSCANRANGE) ?
PICANM_TEXHITSCAN_BIT : PICANM_NOFULLBRIGHT_BIT;
Texel-granular hitscan() for wall-aligned sprites. The attribute is set per tile from DEF: either texhitscanrange <begintile> <endtile> or tilefromtexture <tile> { ... texhitscan ... } (As a special case, the list may only contain "texhitscan", in which case the texture is not changed.) In passing, do some cleanup for "tilefromtexture" DEF parsing: the list tokens should now be accepted in any order, and errors don't appear in the middle of the list parsing. git-svn-id: https://svn.eduke32.com/eduke32@3078 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-14 20:41:34 +00:00
}
break;
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
case T_SOUND:
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
case T_MUSIC:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos p;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString dummy, dummy2;
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
static const tokenlist sound_musictokens[] =
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
{
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
{ "id", T_ID },
{ "file", T_FILE },
};
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
if (scriptfile_getbraces(script,&p)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, p))
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,sound_musictokens,countof(sound_musictokens)))
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
{
case T_ID:
Global thermonuclear code rape git-svn-id: https://svn.eduke32.com/eduke32@1677 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 08:13:51 +00:00
scriptfile_getstring(script,&dummy2);
OpenAL patch from Hunter_rus... haven't even tried to make this work with MSVC yet git-svn-id: https://svn.eduke32.com/eduke32@634 1a8010ca-5511-0410-912e-c29ae57300e0
2008-03-08 05:23:15 +00:00
break;
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
case T_FILE:
- fixed bad file checks in defs parser.
2020-09-12 10:39:18 +00:00
scriptfile_getstring(script,&dummy);
OpenAL patch from Hunter_rus... haven't even tried to make this work with MSVC yet git-svn-id: https://svn.eduke32.com/eduke32@634 1a8010ca-5511-0410-912e-c29ae57300e0
2008-03-08 05:23:15 +00:00
break;
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
}
}
- consolidated the 'music' parsing in Defs (pending a refactor of the MAPINFO system.) - removed the remaining parts of the game Defs parser because we do not want anything EDuke in here.
2020-06-23 22:40:22 +00:00
SetMusicForMap(dummy2, dummy, true);
patch from hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@587 1a8010ca-5511-0410-912e-c29ae57300e0
2007-12-20 19:14:38 +00:00
}
break;
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
case T_MAPINFO:
{
- rewrote the map hack parser using sc_man. This unexpectedly turned out a complete rewrite so now it is under my own license. Also moved the remaining parts of map hack loading into the engine. Overall I have to say that the feature is not what I expected, it's merely used to fudge the positioning of model sprites and for adding Polymer lights.
2020-09-13 11:01:44 +00:00
FString mapmd4string;
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos mapinfoend;
- rewrote the map hack parser using sc_man. This unexpectedly turned out a complete rewrite so now it is under my own license. Also moved the remaining parts of map hack loading into the engine. Overall I have to say that the feature is not what I expected, it's merely used to fudge the positioning of model sprites and for adding Polymer lights.
2020-09-13 11:01:44 +00:00
usermaphack_t mhk;
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
static const tokenlist mapinfotokens[] =
{
{ "mapfile", T_MAPFILE },
{ "maptitle", T_MAPTITLE },
{ "mapmd4", T_MAPMD4 },
{ "mhkfile", T_MHKFILE },
};
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (scriptfile_getbraces(script,&mapinfoend)) break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, mapinfoend))
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script,mapinfotokens,countof(mapinfotokens)))
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
{
case T_MAPFILE:
- rewrote the map hack parser using sc_man. This unexpectedly turned out a complete rewrite so now it is under my own license. Also moved the remaining parts of map hack loading into the engine. Overall I have to say that the feature is not what I expected, it's merely used to fudge the positioning of model sprites and for adding Polymer lights.
2020-09-13 11:01:44 +00:00
scriptfile_getstring(script,nullptr);
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
break;
case T_MAPTITLE:
- rewrote the map hack parser using sc_man. This unexpectedly turned out a complete rewrite so now it is under my own license. Also moved the remaining parts of map hack loading into the engine. Overall I have to say that the feature is not what I expected, it's merely used to fudge the positioning of model sprites and for adding Polymer lights.
2020-09-13 11:01:44 +00:00
scriptfile_getstring(script,&mhk.title);
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
break;
case T_MAPMD4:
Implement UserMapHacks. git-svn-id: https://svn.eduke32.com/eduke32@4884 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-08 15:14:00 +00:00
{
scriptfile_getstring(script,&mapmd4string);
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
for (int i = 0; i < 16; i++)
Implement UserMapHacks. git-svn-id: https://svn.eduke32.com/eduke32@4884 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-08 15:14:00 +00:00
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
char smallbuf[3] = { mapmd4string[2 * i], mapmd4string[2 * i + 1], 0 };
- rewrote the map hack parser using sc_man. This unexpectedly turned out a complete rewrite so now it is under my own license. Also moved the remaining parts of map hack loading into the engine. Overall I have to say that the feature is not what I expected, it's merely used to fudge the positioning of model sprites and for adding Polymer lights.
2020-09-13 11:01:44 +00:00
mhk.md4[i] = strtol(smallbuf, NULL, 16);
Implement UserMapHacks. git-svn-id: https://svn.eduke32.com/eduke32@4884 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-08 15:14:00 +00:00
}
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
break;
Implement UserMapHacks. git-svn-id: https://svn.eduke32.com/eduke32@4884 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-08 15:14:00 +00:00
}
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
case T_MHKFILE:
- rewrote the map hack parser using sc_man. This unexpectedly turned out a complete rewrite so now it is under my own license. Also moved the remaining parts of map hack loading into the engine. Overall I have to say that the feature is not what I expected, it's merely used to fudge the positioning of model sprites and for adding Polymer lights.
2020-09-13 11:01:44 +00:00
scriptfile_getstring(script,&mhk.mhkfile);
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
break;
}
}
- rewrote the map hack parser using sc_man. This unexpectedly turned out a complete rewrite so now it is under my own license. Also moved the remaining parts of map hack loading into the engine. Overall I have to say that the feature is not what I expected, it's merely used to fudge the positioning of model sprites and for adding Polymer lights.
2020-09-13 11:01:44 +00:00
AddUserMapHack(mhk);
Add "mapinfo" token to the def parser, pending implementation. Sub-tokens: "mapfile", "maptitle", "mapmd4", "mhkfile" http://forums.duke4.net/topic/6070-user-map-maphacks-eduke32-feature-request/ git-svn-id: https://svn.eduke32.com/eduke32@3309 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-23 03:12:50 +00:00
}
break;
Add "echo" def parameter which prints a string to the console and log file. Syntax: echo "Your text here." git-svn-id: https://svn.eduke32.com/eduke32@2435 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-10 09:44:17 +00:00
case T_ECHO:
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString string;
Add "echo" def parameter which prints a string to the console and log file. Syntax: echo "Your text here." git-svn-id: https://svn.eduke32.com/eduke32@2435 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-10 09:44:17 +00:00
scriptfile_getstring(script,&string);
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
Printf("%s\n",string.GetChars());
Add "echo" def parameter which prints a string to the console and log file. Syntax: echo "Your text here." git-svn-id: https://svn.eduke32.com/eduke32@2435 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-10 09:44:17 +00:00
}
break;
Add "globalflags" def token. Flag 1 is a kill switch for the tileshades and artmapping features. Flag 2 is kill switch for the GL fullbright rendering pass. git-svn-id: https://svn.eduke32.com/eduke32@5056 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-09 20:32:36 +00:00
case T_GLOBALFLAGS:
{
if (scriptfile_getnumber(script,&globalflags)) break;
}
break;
Add game-side def "globalgameflags" that takes a single value. Flag 1 disables hardcoded pinning of HUD weapons to the side of the screen in widescreen. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@5161 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-24 00:08:46 +00:00
case T_GLOBALGAMEFLAGS:
{
int32_t dummy;
if (scriptfile_getnumber(script,&dummy)) break;
}
break;
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
case T_MULTIPSKY:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos blockend;
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
int32_t tile;
static const tokenlist subtokens[] =
{
{ "horizfrac", T_HORIZFRAC },
Defs: Add "yoffset" subtoken to "multipsky". git-svn-id: https://svn.eduke32.com/eduke32@5897 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:53 +00:00
{ "yoffset", T_YOFFSET },
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
{ "lognumtiles", T_LOGNUMTILES },
{ "tile", T_TILE },
{ "panel", T_TILE },
New def token for "multipsky": "yscale". multipsky <tile> { yscale <yscale> } Default value is 65536. Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6519 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:48 +00:00
{ "yscale", T_YSCALE },
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
};
if (scriptfile_getsymbol(script,&tile))
break;
if (scriptfile_getbraces(script,&blockend))
break;
if (tile != DEFAULTPSKY && (unsigned)tile >= MAXUSERTILES)
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
scriptfile_setposition(script, blockend);
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
break;
}
Function names git-svn-id: https://svn.eduke32.com/eduke32@6831 1a8010ca-5511-0410-912e-c29ae57300e0
2018-04-12 21:03:47 +00:00
psky_t * const newpsky = tileSetupSky(tile);
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, blockend))
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,subtokens,countof(subtokens));
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
switch (token)
{
case T_HORIZFRAC:
{
int32_t horizfrac;
scriptfile_getsymbol(script,&horizfrac);
newpsky->horizfrac = horizfrac;
break;
}
Defs: Add "yoffset" subtoken to "multipsky". git-svn-id: https://svn.eduke32.com/eduke32@5897 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:53 +00:00
case T_YOFFSET:
{
int32_t yoffset;
scriptfile_getsymbol(script,&yoffset);
newpsky->yoffs = yoffset;
break;
}
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
case T_LOGNUMTILES:
{
int32_t lognumtiles;
scriptfile_getsymbol(script,&lognumtiles);
if ((1<<lognumtiles) > MAXPSKYTILES)
break;
newpsky->lognumtiles = lognumtiles;
break;
}
case T_TILE:
{
int32_t panel, offset;
scriptfile_getsymbol(script,&panel);
scriptfile_getsymbol(script,&offset);
if ((unsigned) panel >= MAXPSKYTILES)
break;
if ((unsigned) offset > PSKYOFF_MAX)
break;
newpsky->tileofs[panel] = offset;
break;
}
New def token for "multipsky": "yscale". multipsky <tile> { yscale <yscale> } Default value is 65536. Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6519 1a8010ca-5511-0410-912e-c29ae57300e0
2017-11-29 07:29:48 +00:00
case T_YSCALE:
{
int32_t yscale;
scriptfile_getsymbol(script,&yscale);
newpsky->yscale = yscale;
break;
}
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
default:
break;
}
}
}
break;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
case T_BASEPALETTE:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos blockend;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
int32_t id;
static const tokenlist subtokens[] =
{
{ "raw", T_RAW },
{ "copy", T_COPY },
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
{ "undef", T_UNDEF },
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
};
if (scriptfile_getsymbol(script,&id))
break;
if (scriptfile_getbraces(script,&blockend))
break;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)id >= MAXBASEPALS)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "basepalette: Invalid basepal number");
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
scriptfile_setposition(script, blockend);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
int didLoadPal = 0;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, blockend))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,subtokens,countof(subtokens));
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
switch (token)
{
case T_RAW:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos rawblockend;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
static const tokenlist rawsubtokens[] =
{
{ "file", T_FILE },
{ "offset", T_OFFSET },
{ "shiftleft", T_SHIFTLEFT },
};
if (scriptfile_getbraces(script,&rawblockend))
break;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
int32_t offset = 0;
int32_t shiftleft = 0;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, rawblockend))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,rawsubtokens,countof(rawsubtokens));
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
switch (token)
{
case T_FILE:
{
scriptfile_getstring(script,&fn);
break;
}
case T_OFFSET:
{
scriptfile_getnumber(script,&offset);
break;
}
case T_SHIFTLEFT:
{
scriptfile_getnumber(script,&shiftleft);
break;
}
default:
break;
}
}
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
if (fn.IsEmpty())
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "basepalette: No filename provided");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (offset < 0)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "basepalette: Invalid file offset");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)shiftleft >= 8)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "basepalette: Invalid left shift provided");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- file system update and adjustment.
2020-04-11 21:54:33 +00:00
FileReader fil = fileSystem.OpenFileReader(fn);
- refactored most of the remaining calls to kopen4load
2019-10-21 15:16:08 +00:00
if (!fil.isOpen())
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "basepalette: Failed opening \"%s\"", fn.GetChars());
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- refactored most of the remaining calls to kopen4load
2019-10-21 15:16:08 +00:00
if (fil.Seek(offset, FileReader::SeekSet) < 0)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "basepalette: Seek failed");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- refactored most of the remaining calls to kopen4load
2019-10-21 15:16:08 +00:00
auto palbuf = fil.Read();
if (palbuf.Size() < 768)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "basepalette: Read failed");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
if (shiftleft != 0)
{
Use size_t or ssize_t in for loops where possible git-svn-id: https://svn.eduke32.com/eduke32@5829 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:41:21 +00:00
for (bssize_t k = 0; k < 768; k++)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
palbuf[k] <<= shiftleft;
}
- refactoring of the lookup tables.
2020-05-23 12:40:54 +00:00
paletteSetColorTable(id, palbuf.Data(), false, false);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
didLoadPal = 1;
break;
}
case T_COPY:
{
int32_t source;
scriptfile_getsymbol(script,&source);
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)source >= MAXBASEPALS || source == id)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "basepalette: Invalid source basepal number");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- store palettes in the palette container.
2020-04-12 05:50:24 +00:00
auto sourcepal = GPalette.GetTranslation(Translation_BasePalettes, source);
if (sourcepal == NULL)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "basepalette: Source basepal does not exist");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- store palettes in the palette container.
2020-04-12 05:50:24 +00:00
GPalette.CopyTranslation(TRANSLATION(Translation_BasePalettes, id), TRANSLATION(Translation_BasePalettes, source));
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
didLoadPal = 1;
break;
}
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
case T_UNDEF:
{
- store palettes in the palette container.
2020-04-12 05:50:24 +00:00
GPalette.ClearTranslationSlot(TRANSLATION(Translation_BasePalettes, id));
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
didLoadPal = 0;
if (id == 0)
paletteloaded &= ~PALETTE_MAIN;
break;
}
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
default:
break;
}
}
if (didLoadPal && id == 0)
{
paletteloaded |= PALETTE_MAIN;
}
}
break;
case T_PALOOKUP:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos blockend;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
int32_t id;
static const tokenlist subtokens[] =
{
{ "raw", T_RAW },
{ "copy", T_COPY },
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
{ "undef", T_UNDEF },
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{ "fogpal", T_FOGPAL },
{ "makepalookup", T_MAKEPALOOKUP },
{ "floorpal", T_FLOORPAL },
{ "nofloorpal", T_NOFLOORPAL },
};
if (scriptfile_getsymbol(script,&id))
break;
if (scriptfile_getbraces(script,&blockend))
break;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)id >= MAXPALOOKUPS)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Invalid pal number");
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
scriptfile_setposition(script, blockend);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
int didLoadShade = 0;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, blockend))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,subtokens,countof(subtokens));
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
switch (token)
{
case T_RAW:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos subblockend;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
static const tokenlist rawsubtokens[] =
{
{ "file", T_FILE },
{ "offset", T_OFFSET },
{ "noshades", T_NOSHADES },
};
if (scriptfile_getbraces(script,&subblockend))
break;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
int32_t offset = 0;
int32_t length = 256*32; // hardcoding 32 instead of numshades
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, subblockend))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,rawsubtokens,countof(rawsubtokens));
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
switch (token)
{
case T_FILE:
{
scriptfile_getstring(script,&fn);
break;
}
case T_OFFSET:
{
scriptfile_getnumber(script,&offset);
break;
}
case T_NOSHADES:
{
length = 256;
break;
}
default:
break;
}
}
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
if (fn.IsEmpty())
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: No filename provided");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (offset < 0)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Invalid file offset");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- file system update and adjustment.
2020-04-11 21:54:33 +00:00
FileReader fil = fileSystem.OpenFileReader(fn);
- refactored most of the remaining calls to kopen4load
2019-10-21 15:16:08 +00:00
if (!fil.isOpen())
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Failed opening \"%s\"", fn.GetChars());
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- refactored most of the remaining calls to kopen4load
2019-10-21 15:16:08 +00:00
if (fil.Seek(offset, FileReader::SeekSet) < 0)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Seek failed");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- refactored most of the remaining calls to kopen4load
2019-10-21 15:16:08 +00:00
auto palookupbuf = fil.Read();
if (palookupbuf.Size() < 256)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Read failed");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- fixed compilation.
2019-10-21 17:36:54 +00:00
if (palookupbuf.Size() >= 256*32)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
didLoadShade = 1;
numshades = 32;
- palette code cleanup.
2020-05-27 20:19:02 +00:00
lookups.setTable(id, palookupbuf.Data());
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
}
else
{
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (!(paletteloaded & PALETTE_SHADE))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Shade tables not loaded");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- palette code cleanup.
2020-05-27 20:19:02 +00:00
lookups.makeTable(id, palookupbuf.Data(), 0,0,0, lookups.tables[id].noFloorPal);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
}
break;
}
case T_COPY:
{
int32_t source;
scriptfile_getsymbol(script,&source);
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)source >= MAXPALOOKUPS || source == id)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Invalid source pal number");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (source == 0 && !(paletteloaded & PALETTE_SHADE))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Shade tables not loaded");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- palette code cleanup.
2020-05-27 20:19:02 +00:00
if (lookups.checkTable(source) || id > 0) // do not overwrite the base with an empty table.
lookups.copyTable(id, source);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
didLoadShade = 1;
break;
}
case T_FOGPAL:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos subblockend;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
static const tokenlist fogpaltokens[] =
{
{ "red", T_RED }, { "r", T_RED },
{ "green", T_GREEN }, { "g", T_GREEN },
{ "blue", T_BLUE }, { "b", T_BLUE },
};
int32_t red = 0, green = 0, blue = 0;
if (scriptfile_getbraces(script,&subblockend))
break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, subblockend))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script, fogpaltokens, countof(fogpaltokens)))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
case T_RED:
scriptfile_getnumber(script,&red);
Fix some critical mistakes in my new def code (r5351 and r5367) caused by gaps in my attention. git-svn-id: https://svn.eduke32.com/eduke32@5377 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-10 06:57:36 +00:00
red = clamp(red, 0, 255);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
case T_GREEN:
scriptfile_getnumber(script,&green);
Fix some critical mistakes in my new def code (r5351 and r5367) caused by gaps in my attention. git-svn-id: https://svn.eduke32.com/eduke32@5377 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-10 06:57:36 +00:00
green = clamp(green, 0, 255);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
case T_BLUE:
scriptfile_getnumber(script,&blue);
Fix some critical mistakes in my new def code (r5351 and r5367) caused by gaps in my attention. git-svn-id: https://svn.eduke32.com/eduke32@5377 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-10 06:57:36 +00:00
blue = clamp(blue, 0, 255);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (!(paletteloaded & PALETTE_SHADE))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Shade tables not loaded");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- palette code cleanup.
2020-05-27 20:19:02 +00:00
lookups.makeTable(id, NULL, red, green, blue, 1);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
case T_MAKEPALOOKUP:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos subblockend;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
static const tokenlist makepalookuptokens[] =
{
{ "red", T_RED }, { "r", T_RED },
{ "green", T_GREEN }, { "g", T_GREEN },
{ "blue", T_BLUE }, { "b", T_BLUE },
{ "remappal", T_REMAPPAL },
{ "remapself", T_REMAPSELF },
};
int32_t red = 0, green = 0, blue = 0;
int32_t remappal = -1;
if (scriptfile_getbraces(script,&subblockend))
break;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, subblockend))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
switch (getatoken(script, makepalookuptokens, countof(makepalookuptokens)))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
case T_RED:
scriptfile_getnumber(script,&red);
Fix some critical mistakes in my new def code (r5351 and r5367) caused by gaps in my attention. git-svn-id: https://svn.eduke32.com/eduke32@5377 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-10 06:57:36 +00:00
red = clamp(red, 0, 255);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
case T_GREEN:
scriptfile_getnumber(script,&green);
Fix some critical mistakes in my new def code (r5351 and r5367) caused by gaps in my attention. git-svn-id: https://svn.eduke32.com/eduke32@5377 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-10 06:57:36 +00:00
green = clamp(green, 0, 255);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
case T_BLUE:
scriptfile_getnumber(script,&blue);
Fix some critical mistakes in my new def code (r5351 and r5367) caused by gaps in my attention. git-svn-id: https://svn.eduke32.com/eduke32@5377 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-10 06:57:36 +00:00
blue = clamp(blue, 0, 255);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
case T_REMAPPAL:
scriptfile_getsymbol(script,&remappal);
break;
case T_REMAPSELF:
remappal = id;
break;
}
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)remappal >= MAXPALOOKUPS)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Invalid remappal");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (!(paletteloaded & PALETTE_SHADE))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "palookup: Shade tables not loaded");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- palette code cleanup.
2020-05-27 20:19:02 +00:00
lookups.makeTable(id, NULL, red, green, blue, lookups.tables[id].noFloorPal);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
case T_NOFLOORPAL:
{
- palette code cleanup.
2020-05-27 20:19:02 +00:00
lookups.tables[id].noFloorPal = 1;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
case T_FLOORPAL:
{
- palette code cleanup.
2020-05-27 20:19:02 +00:00
lookups.tables[id].noFloorPal = 0;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
case T_UNDEF:
{
- palette code cleanup.
2020-05-27 20:19:02 +00:00
lookups.clearTable(id);
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
didLoadShade = 0;
if (id == 0)
paletteloaded &= ~PALETTE_SHADE;
break;
}
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
default:
break;
}
}
if (didLoadShade && id == 0)
{
paletteloaded |= PALETTE_SHADE;
}
}
break;
case T_BLENDTABLE:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos blockend;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
int32_t id;
static const tokenlist subtokens[] =
{
{ "raw", T_RAW },
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
{ "glblend", T_GLBLEND },
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{ "copy", T_COPY },
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
{ "undef", T_UNDEF },
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
};
if (scriptfile_getsymbol(script,&id))
break;
if (scriptfile_getbraces(script,&blockend))
break;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)id >= MAXBLENDTABS)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "blendtable: Invalid blendtable number");
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
scriptfile_setposition(script, blockend);
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, blockend))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,subtokens,countof(subtokens));
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
switch (token)
{
case T_RAW:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos rawblockend;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
static const tokenlist rawsubtokens[] =
{
{ "file", T_FILE },
{ "offset", T_OFFSET },
};
if (scriptfile_getbraces(script,&rawblockend))
break;
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString fn;
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
int32_t offset = 0;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, rawblockend))
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t token = getatoken(script,rawsubtokens,countof(rawsubtokens));
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
switch (token)
{
case T_FILE:
{
scriptfile_getstring(script,&fn);
break;
}
case T_OFFSET:
{
scriptfile_getnumber(script,&offset);
break;
}
default:
break;
}
}
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
if (fn.IsEmpty())
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "blendtable: No filename provided");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (offset < 0)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "blendtable: Invalid file offset");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- file system update and adjustment.
2020-04-11 21:54:33 +00:00
FileReader fil = fileSystem.OpenFileReader(fn);
- refactored most of the remaining calls to kopen4load
2019-10-21 15:16:08 +00:00
if (!fil.isOpen())
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "blendtable: Failed opening \"%s\"", fn.GetChars());
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- refactored most of the remaining calls to kopen4load
2019-10-21 15:16:08 +00:00
if (fil.Seek(offset, FileReader::SeekSet) < 0)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "blendtable: Seek failed");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
- refactored most of the remaining calls to kopen4load
2019-10-21 15:16:08 +00:00
auto blendbuf = fil.Read();
if (blendbuf.Size() < 256*256)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "blendtable: Read failed");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
break;
}
case T_COPY:
{
int32_t source;
scriptfile_getsymbol(script,&source);
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if ((unsigned)source >= MAXBLENDTABS || source == id)
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "blendtable: Invalid source blendtable number");
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
glblend[id] = glblend[source];
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
break;
}
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
case T_UNDEF:
{
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
glblend[id] = defaultglblend;
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
break;
}
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
case T_GLBLEND:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos glblendblockend;
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
static const tokenlist glblendtokens[] =
{
{ "forward", T_FORWARD },
{ "reverse", T_REVERSE },
{ "both", T_BOTH },
};
if (scriptfile_getbraces(script,&glblendblockend))
break;
glblend_t * const glb = glblend + id;
*glb = nullglblend;
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, glblendblockend))
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t glblendtoken = getatoken(script,glblendtokens,countof(glblendtokens));
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
switch (glblendtoken)
{
case T_FORWARD:
case T_REVERSE:
case T_BOTH:
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos glblenddefblockend;
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
static const tokenlist glblenddeftokens[] =
{
{ "src", T_SRC },
{ "sfactor", T_SRC },
{ "top", T_SRC },
{ "dst", T_DST },
{ "dfactor", T_DST },
{ "bottom", T_DST },
{ "alpha", T_ALPHA },
};
if (scriptfile_getbraces(script,&glblenddefblockend))
break;
glblenddef_t * const glbdef = glb->def + (glblendtoken == T_REVERSE);
- replaced brace loop condition in def parser with an inline
2020-09-13 22:19:20 +00:00
while (!scriptfile_endofblock(script, glblenddefblockend))
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
{
- more compat.h cleanup Its elimination is getting closer. :)
2020-09-08 16:48:18 +00:00
int32_t glblenddeftoken = getatoken(script,glblenddeftokens,countof(glblenddeftokens));
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
switch (glblenddeftoken)
{
case T_SRC:
case T_DST:
{
uint8_t * const factor = glblenddeftoken == T_SRC ? &glbdef->src : &glbdef->dst;
- simplified the parser for blend modes
2020-09-22 21:05:43 +00:00
if (script->Compare("ZERO")) *factor = STYLEALPHA_Zero;
else if (script->Compare("ONE")) *factor = STYLEALPHA_One;
else if (script->Compare("SRC_COLOR")) *factor = STYLEALPHA_SrcCol;
else if (script->Compare("ONE_MINUS_SRC_COLOR")) *factor = STYLEALPHA_InvSrcCol;
else if (script->Compare("SRC_ALPHA")) *factor = STYLEALPHA_Src;
else if (script->Compare("ONE_MINUS_SRC_ALPHA")) *factor = STYLEALPHA_InvSrc;
else if (script->Compare("DST_ALPHA")) *factor = STYLEALPHA_Dst;
else if (script->Compare("ONE_MINUS_DST_ALPHA")) *factor = STYLEALPHA_InvDst;
else if (script->Compare("DST_COLOR")) *factor = STYLEALPHA_DstCol;
else if (script->Compare("ONE_MINUS_DST_COLOR")) *factor = STYLEALPHA_InvDstCol;
else script->ScriptMessage("Unknown blend operation %s", script->String);
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
break;
}
case T_ALPHA:
{
double tempalpha;
scriptfile_getdouble(script,&tempalpha);
glbdef->alpha = (float)tempalpha;
break;
}
}
}
if (glblendtoken == T_BOTH)
glb->def[1] = *glbdef;
break;
}
}
}
}
Defs: Add basepalette, palookup, and blendtable tokens. git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-23 17:55:19 +00:00
default:
break;
}
}
}
break;
Defs: Add "numalphatables" token, which serves the same purpose as the lognumalphatabs byte in PALETTE.DAT. git-svn-id: https://svn.eduke32.com/eduke32@5366 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-27 21:18:24 +00:00
case T_NUMALPHATABS:
{
int32_t value;
if (scriptfile_getnumber(script,&value)) break;
switch (value)
{
Add a new aligned mode to alphatabs by defining numalphatabs to be a power of two minus one. This provides fractionally better correspondence between 0-255 alpha values and blend table IDs. git-svn-id: https://svn.eduke32.com/eduke32@5890 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:32 +00:00
case 1: case 3: case 7: case 15: case 31: case 63: case 127:
case 2: case 4: case 8: case 16: case 32: case 64: case 128:
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
#ifdef USE_OPENGL
Add a new aligned mode to alphatabs by defining numalphatabs to be a power of two minus one. This provides fractionally better correspondence between 0-255 alpha values and blend table IDs. git-svn-id: https://svn.eduke32.com/eduke32@5890 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:32 +00:00
for (int32_t a = 1, value2 = value*2 + (value&1); a <= value; ++a)
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
{
Add a new aligned mode to alphatabs by defining numalphatabs to be a power of two minus one. This provides fractionally better correspondence between 0-255 alpha values and blend table IDs. git-svn-id: https://svn.eduke32.com/eduke32@5890 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:32 +00:00
float finv2value = 1.f/(float)value2;
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
glblend_t * const glb = glblend + a;
*glb = defaultglblend;
glb->def[0].alpha = (float)(value2-a) * finv2value;
glb->def[1].alpha = (float)a * finv2value;
}
Fix gcc 7.1.0 warnings git-svn-id: https://svn.eduke32.com/eduke32@6370 1a8010ca-5511-0410-912e-c29ae57300e0
2017-07-18 20:53:41 +00:00
fallthrough__;
GL .blend support. Consult me if you are interested in this feature. TODO: Polymer. git-svn-id: https://svn.eduke32.com/eduke32@5888 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 07:55:23 +00:00
#endif
Add a new aligned mode to alphatabs by defining numalphatabs to be a power of two minus one. This provides fractionally better correspondence between 0-255 alpha values and blend table IDs. git-svn-id: https://svn.eduke32.com/eduke32@5890 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:32 +00:00
case 0:
Defs: Add "numalphatables" token, which serves the same purpose as the lognumalphatabs byte in PALETTE.DAT. git-svn-id: https://svn.eduke32.com/eduke32@5366 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-27 21:18:24 +00:00
numalphatabs = value;
break;
default:
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "numalphatables: Invalid value");
Defs: Add "numalphatables" token, which serves the same purpose as the lognumalphatabs byte in PALETTE.DAT. git-svn-id: https://svn.eduke32.com/eduke32@5366 1a8010ca-5511-0410-912e-c29ae57300e0
2015-09-27 21:18:24 +00:00
break;
}
}
break;
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
case T_UNDEFBASEPALETTERANGE:
{
int32_t id0, id1;
if (scriptfile_getsymbol(script,&id0))
break;
if (scriptfile_getsymbol(script,&id1))
break;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (id0 > id1 || (unsigned)id0 >= MAXBASEPALS || (unsigned)id1 >= MAXBASEPALS)
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "undefbasepaletterange: Invalid range");
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
break;
}
Use size_t or ssize_t in for loops where possible git-svn-id: https://svn.eduke32.com/eduke32@5829 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:41:21 +00:00
for (bssize_t i = id0; i <= id1; i++)
- store palettes in the palette container.
2020-04-12 05:50:24 +00:00
GPalette.ClearTranslationSlot(TRANSLATION(Translation_BasePalettes, i));
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
if (id0 == 0)
paletteloaded &= ~PALETTE_MAIN;
}
break;
case T_UNDEFPALOOKUPRANGE:
{
int32_t id0, id1;
if (scriptfile_getsymbol(script,&id0))
break;
if (scriptfile_getsymbol(script,&id1))
break;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (id0 > id1 || (unsigned)id0 >= MAXPALOOKUPS || (unsigned)id1 >= MAXPALOOKUPS)
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "undefpalookuprange: Invalid range");
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
break;
}
Use size_t or ssize_t in for loops where possible git-svn-id: https://svn.eduke32.com/eduke32@5829 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:41:21 +00:00
for (bssize_t i = id0; i <= id1; i++)
- palette code cleanup.
2020-05-27 20:19:02 +00:00
lookups.clearTable(i);
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
if (id0 == 0)
paletteloaded &= ~PALETTE_SHADE;
}
break;
case T_UNDEFBLENDTABLERANGE:
{
int32_t id0, id1;
if (scriptfile_getsymbol(script,&id0))
break;
if (scriptfile_getsymbol(script,&id1))
break;
- compat.h cleanup. * use static_assert directly. Raze is C++17, no need for that macro shit. * removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword. * got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins. * replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX. * replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here. * removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 19:24:48 +00:00
if (id0 > id1 || (unsigned)id0 >= MAXBLENDTABS || (unsigned)id1 >= MAXBLENDTABS)
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
{
- migrated defs error reporting to FScriptPosition This not only prints better formatted texts, it also takes a lot of script maintenance out of the code.
2020-09-14 20:55:21 +00:00
pos.Message(MSG_ERROR, "undefblendtablerange: Invalid range");
Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-03 11:52:51 +00:00
break;
}
}
break;
newgamechoices git-svn-id: https://svn.eduke32.com/eduke32@7930 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/src/defs.cpp
2019-08-09 08:21:19 +00:00
case T_NEWGAMECHOICES: // stub
{
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
FScanner::SavedPos blockend;
newgamechoices git-svn-id: https://svn.eduke32.com/eduke32@7930 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/src/defs.cpp
2019-08-09 08:21:19 +00:00
if (scriptfile_getbraces(script,&blockend))
break;
- avoid using naked pointer for script positioning.
2020-09-13 09:28:32 +00:00
scriptfile_setposition(script, blockend);
break;
newgamechoices git-svn-id: https://svn.eduke32.com/eduke32@7930 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/build/src/defs.cpp
2019-08-09 08:21:19 +00:00
}
- Blood merge # Conflicts: # source/build/include/polymost.h # source/build/src/build.cpp # source/build/src/engine.cpp # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp
2019-09-19 20:02:45 +00:00
case T_RFFDEFINEID:
{
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FString resName;
FString resType;
FString rffName;
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
int resID;
- Blood merge # Conflicts: # source/build/include/polymost.h # source/build/src/build.cpp # source/build/src/engine.cpp # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp
2019-09-19 20:02:45 +00:00
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
if (scriptfile_getstring(script, &resName))
- Blood merge # Conflicts: # source/build/include/polymost.h # source/build/src/build.cpp # source/build/src/engine.cpp # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp
2019-09-19 20:02:45 +00:00
break;
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
if (scriptfile_getstring(script, &resType))
- Blood merge # Conflicts: # source/build/include/polymost.h # source/build/src/build.cpp # source/build/src/engine.cpp # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp
2019-09-19 20:02:45 +00:00
break;
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
if (scriptfile_getnumber(script, &resID))
- Blood merge # Conflicts: # source/build/include/polymost.h # source/build/src/build.cpp # source/build/src/engine.cpp # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp
2019-09-19 20:02:45 +00:00
break;
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
if (scriptfile_getstring(script, &rffName))
- Blood merge # Conflicts: # source/build/include/polymost.h # source/build/src/build.cpp # source/build/src/engine.cpp # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp
2019-09-19 20:02:45 +00:00
break;
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
- use FString for returning strings from the script parser. This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable. This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
2020-09-13 08:29:57 +00:00
FStringf name("%s.%s", resName.GetChars(), resType.GetChars());
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
fileSystem.CreatePathlessCopy(resName, resID, 0);
- Blood merge # Conflicts: # source/build/include/polymost.h # source/build/src/build.cpp # source/build/src/engine.cpp # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp
2019-09-19 20:02:45 +00:00
}
break;
Defs: Add "multipsky" token. git-svn-id: https://svn.eduke32.com/eduke32@5256 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-27 08:47:50 +00:00
- consolidated the DEF parser parts in the backend. Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 18:29:37 +00:00
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
default:
- better error message
2020-09-22 06:49:03 +00:00
pos.Message(MSG_ERROR, "%s: Unknown token.", script->String); break;
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
}
}
Add a simple indicator of progress when loading a large def (like the HRP)... print one period to the startup window per 50 passes of the main loop in defsparser() git-svn-id: https://svn.eduke32.com/eduke32@3801 1a8010ca-5511-0410-912e-c29ae57300e0
2013-05-23 18:27:24 +00:00
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
return 0;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
}
- widescreen asset setup and consolidation of .def file loading.
2020-09-16 14:42:44 +00:00
int32_t loaddefinitionsfile(const char *fn, bool loadadds)
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
{
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
scriptfile *script;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
script = scriptfile_fromfile(fn);
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
Load def modules even if no root def exists. Print a message to the log for each def module that is loaded. git-svn-id: https://svn.eduke32.com/eduke32@3621 1a8010ca-5511-0410-912e-c29ae57300e0
2013-03-28 09:06:14 +00:00
if (script)
{
- do not print game init messages to the notify display.
2020-08-26 18:19:54 +00:00
Printf(PRINT_NONOTIFY, "Loading \"%s\"\n",fn);
Load def modules even if no root def exists. Print a message to the log for each def module that is loaded. git-svn-id: https://svn.eduke32.com/eduke32@3621 1a8010ca-5511-0410-912e-c29ae57300e0
2013-03-28 09:06:14 +00:00
defsparser(script);
}
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
- widescreen asset setup and consolidation of .def file loading.
2020-09-16 14:42:44 +00:00
if (userConfig.AddDefs && loadadds) for (auto& m : *userConfig.AddDefs)
- redid scriptfile as a wrapper around FScanner Another piece of Build licensed code gone, yay! This will also allow gradual conversion of the DEF parser to our own code, unencumbered by the Build license. :)
2020-09-14 22:11:08 +00:00
{
Printf("Loading module \"%s\"\n",m.GetChars());
defsparser_include(m, NULL, NULL); // Q: should we let the external script see our symbol table?
}
My first commit! The main feature is the addition of -mx and -mh command-line parameters to EDuke32 and Mapster32. These parameters include a con and def "module" respectively. This translates into essentially including the file from the bottom of the compiled script. I fixed the classic buggy behavior of the BROKEHYDROPLANT and REACTOR2 sprites. I also fixed a small, long-standing bug where FRAMEEFFECT1 blurs are not affected by sector floorpal. You can see one example of this by shrinking the Enforcer on the upper inside of the toppled building in E3L11: Freeway. I tweaked the Makefile so that it would automatically regenerate the keep.me files in the $(OBJ) and $(EOBJ) directories after they are deleted for cleaning. One final change is a slight positioning cleanup of both programs' --help dialog boxes. git-svn-id: https://svn.eduke32.com/eduke32@1937 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-21 22:39:29 +00:00
Load def modules even if no root def exists. Print a message to the log for each def module that is loaded. git-svn-id: https://svn.eduke32.com/eduke32@3621 1a8010ca-5511-0410-912e-c29ae57300e0
2013-03-28 09:06:14 +00:00
if (script)
scriptfile_close(script);
Re-use temporary buffer for tilefromtexture true color -> paletted conversion and free when finished with the .def instead of freeing and re-allocating for every tile git-svn-id: https://svn.eduke32.com/eduke32@4637 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:17:53 +00:00
DO_FREE_AND_NULL(faketilebuffer);
faketilebuffersiz = 0;
Load def modules even if no root def exists. Print a message to the log for each def module that is loaded. git-svn-id: https://svn.eduke32.com/eduke32@3621 1a8010ca-5511-0410-912e-c29ae57300e0
2013-03-28 09:06:14 +00:00
if (!script) return -1;
- do not print game init messages to the notify display.
2020-08-26 18:19:54 +00:00
Printf(PRINT_NONOTIFY, "\n");
Revert "Prettify the DEF progress meter by relocating '\n' en masse." This reverts commit c7e51147f1869d42fc8365f748bb8f6bd4c6fc2f. [r3835] Conflicts: eduke32/build/src/defs.c [Dunno what caused this, but I cleaned this out. Also, the change from build.c was not reverted.] git-svn-id: https://svn.eduke32.com/eduke32@4061 1a8010ca-5511-0410-912e-c29ae57300e0
2013-09-13 20:23:59 +00:00
Whitespace git-svn-id: https://svn.eduke32.com/eduke32@109 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-24 19:04:22 +00:00
return 0;
Changes from JonoF & dos2unix on all build src git-svn-id: https://svn.eduke32.com/eduke32@99 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-23 06:44:19 +00:00
}
// vim:ts=4:
Reference in a new issue Copy permalink