2006-02-24 04:48:15 +00:00
|
|
|
#ifndef __SC_MAN_H__
|
|
|
|
#define __SC_MAN_H__
|
|
|
|
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
class FScanner
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
struct SavedPos
|
|
|
|
{
|
|
|
|
const char *SavedScriptPtr;
|
|
|
|
int SavedScriptLine;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Methods ------------------------------------------------------
|
|
|
|
FScanner();
|
|
|
|
FScanner(const FScanner &other);
|
|
|
|
FScanner(int lumpnum, const char *name);
|
|
|
|
~FScanner();
|
|
|
|
|
|
|
|
FScanner &operator=(const FScanner &other);
|
|
|
|
|
|
|
|
void Open(const char *lumpname);
|
|
|
|
void OpenFile(const char *filename);
|
|
|
|
void OpenMem(const char *name, char *buffer, int size);
|
|
|
|
void OpenLumpNum(int lump, const char *name);
|
|
|
|
void Close();
|
|
|
|
|
|
|
|
void SetCMode(bool cmode);
|
|
|
|
void SetEscape(bool esc);
|
|
|
|
const SavedPos SavePos();
|
|
|
|
void RestorePos(const SavedPos &pos);
|
|
|
|
|
|
|
|
FString TokenName(int token, const char *string=NULL);
|
|
|
|
|
|
|
|
bool GetString();
|
|
|
|
void MustGetString();
|
|
|
|
void MustGetStringName(const char *name);
|
|
|
|
bool CheckString(const char *name);
|
|
|
|
|
|
|
|
bool GetToken();
|
|
|
|
void MustGetAnyToken();
|
|
|
|
void TokenMustBe(int token);
|
|
|
|
void MustGetToken(int token);
|
|
|
|
bool CheckToken(int token);
|
|
|
|
bool CheckTokenId(ENamedName id);
|
|
|
|
|
|
|
|
bool GetNumber();
|
|
|
|
void MustGetNumber();
|
|
|
|
bool CheckNumber();
|
|
|
|
|
|
|
|
bool GetFloat();
|
|
|
|
void MustGetFloat();
|
|
|
|
bool CheckFloat();
|
|
|
|
|
|
|
|
void UnGet();
|
|
|
|
|
|
|
|
bool Compare(const char *text);
|
|
|
|
int MatchString(const char **strings);
|
|
|
|
int MustMatchString(const char **strings);
|
|
|
|
|
|
|
|
void ScriptError(const char *message, ...);
|
|
|
|
|
|
|
|
// Members ------------------------------------------------------
|
|
|
|
char *String;
|
|
|
|
int StringLen;
|
|
|
|
int TokenType;
|
|
|
|
int Number;
|
|
|
|
double Float;
|
|
|
|
FName Name;
|
|
|
|
int Line;
|
|
|
|
bool End;
|
|
|
|
bool Crossed;
|
|
|
|
|
|
|
|
protected:
|
|
|
|
void PrepareScript();
|
|
|
|
void CheckOpen();
|
|
|
|
bool ScanString(bool tokens);
|
|
|
|
|
|
|
|
// Strings longer than this minus one will be dynamically allocated.
|
|
|
|
static const int MAX_STRING_SIZE = 128;
|
|
|
|
|
|
|
|
bool ScriptOpen;
|
|
|
|
FString ScriptName;
|
|
|
|
FString ScriptBuffer;
|
|
|
|
const char *ScriptPtr;
|
|
|
|
const char *ScriptEndPtr;
|
|
|
|
char StringBuffer[MAX_STRING_SIZE];
|
|
|
|
FString BigStringBuffer;
|
|
|
|
bool AlreadyGot;
|
|
|
|
int AlreadyGotLine;
|
|
|
|
bool LastGotToken;
|
|
|
|
const char *LastGotPtr;
|
|
|
|
int LastGotLine;
|
|
|
|
bool CMode;
|
|
|
|
bool Escape;
|
|
|
|
};
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2006-11-29 04:51:16 +00:00
|
|
|
enum
|
|
|
|
{
|
|
|
|
TK_Identifier = 257,
|
|
|
|
TK_StringConst,
|
|
|
|
TK_NameConst,
|
|
|
|
TK_IntConst,
|
|
|
|
TK_FloatConst,
|
|
|
|
TK_Ellipsis, // ...
|
|
|
|
TK_RShiftEq, // >>=
|
2007-05-27 12:16:43 +00:00
|
|
|
TK_URShiftEq, // >>>=
|
2006-11-29 04:51:16 +00:00
|
|
|
TK_LShiftEq, // <<=
|
|
|
|
TK_AddEq, // +=
|
|
|
|
TK_SubEq, // -=
|
|
|
|
TK_MulEq, // *=
|
|
|
|
TK_DivEq, // /=
|
|
|
|
TK_ModEq, // %=
|
|
|
|
TK_AndEq, // &=
|
|
|
|
TK_XorEq, // ^=
|
|
|
|
TK_OrEq, // |=
|
|
|
|
TK_RShift, // >>
|
2007-05-27 12:16:43 +00:00
|
|
|
TK_URShift, // >>>
|
2006-11-29 04:51:16 +00:00
|
|
|
TK_LShift, // <<
|
|
|
|
TK_Incr, // ++
|
|
|
|
TK_Decr, // --
|
|
|
|
TK_AndAnd, // &&
|
|
|
|
TK_OrOr, // ||
|
|
|
|
TK_Leq, // <=
|
|
|
|
TK_Geq, // >=
|
|
|
|
TK_Eq, // ==
|
|
|
|
TK_Neq, // !=
|
2006-12-04 23:25:59 +00:00
|
|
|
TK_Action,
|
2006-11-29 04:51:16 +00:00
|
|
|
TK_Break,
|
|
|
|
TK_Case,
|
|
|
|
TK_Const,
|
|
|
|
TK_Continue,
|
|
|
|
TK_Default,
|
|
|
|
TK_Do,
|
|
|
|
TK_Else,
|
|
|
|
TK_For,
|
|
|
|
TK_If,
|
|
|
|
TK_Return,
|
|
|
|
TK_Switch,
|
|
|
|
TK_Until,
|
|
|
|
TK_While,
|
|
|
|
TK_Bool,
|
|
|
|
TK_Float,
|
|
|
|
TK_Double,
|
|
|
|
TK_Char,
|
|
|
|
TK_Byte,
|
|
|
|
TK_SByte,
|
|
|
|
TK_Short,
|
|
|
|
TK_UShort,
|
|
|
|
TK_Int,
|
|
|
|
TK_UInt,
|
|
|
|
TK_Long,
|
|
|
|
TK_ULong,
|
|
|
|
TK_Void,
|
|
|
|
TK_Struct,
|
|
|
|
TK_Class,
|
|
|
|
TK_Mode,
|
|
|
|
TK_Enum,
|
|
|
|
TK_Name,
|
|
|
|
TK_String,
|
|
|
|
TK_Sound,
|
|
|
|
TK_State,
|
|
|
|
TK_Color,
|
|
|
|
TK_Goto,
|
|
|
|
TK_Abstract,
|
|
|
|
TK_ForEach,
|
|
|
|
TK_True,
|
|
|
|
TK_False,
|
|
|
|
TK_None,
|
|
|
|
TK_New,
|
|
|
|
TK_InstanceOf,
|
|
|
|
TK_Auto,
|
|
|
|
TK_Exec,
|
|
|
|
TK_DefaultProperties,
|
|
|
|
TK_Native,
|
|
|
|
TK_Out,
|
|
|
|
TK_Ref,
|
|
|
|
TK_Event,
|
|
|
|
TK_Static,
|
|
|
|
TK_Transient,
|
|
|
|
TK_Volatile,
|
|
|
|
TK_Final,
|
|
|
|
TK_Throws,
|
|
|
|
TK_Extends,
|
|
|
|
TK_Public,
|
|
|
|
TK_Protected,
|
|
|
|
TK_Private,
|
|
|
|
TK_Dot,
|
|
|
|
TK_Cross,
|
|
|
|
TK_Ignores,
|
|
|
|
TK_Localized,
|
|
|
|
TK_Latent,
|
|
|
|
TK_Singular,
|
|
|
|
TK_Config,
|
|
|
|
TK_Coerce,
|
|
|
|
TK_Iterator,
|
|
|
|
TK_Optional,
|
|
|
|
TK_Export,
|
|
|
|
TK_Virtual,
|
|
|
|
TK_Super,
|
|
|
|
TK_Global,
|
|
|
|
TK_Self,
|
|
|
|
TK_Stop,
|
|
|
|
TK_Eval,
|
|
|
|
TK_EvalNot,
|
2007-05-28 14:46:49 +00:00
|
|
|
TK_Pickup,
|
|
|
|
TK_Breakable,
|
|
|
|
TK_Projectile,
|
|
|
|
TK_Include,
|
2006-11-29 04:51:16 +00:00
|
|
|
|
|
|
|
TK_LastToken
|
|
|
|
};
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
#endif //__SC_MAN_H__
|