teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed the MACT scriplib after completing the config transition.

Browse source
This commit is contained in:
Christoph Oelckers 2019-10-27 17:31:23 +01:00
parent aebd22eea8
commit cee194fd05
14 changed files with 12 additions and 1360 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/blood/src/config.cpp
View file

@ -30,7 +30,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "cache1d.h"
#include "sndcards.h"
#include "hash.h"
#include "scriplib.h"
#include "renderlayer.h"
#include "gamecontrol.h"
#include "blood.h"

1
source/duke3d/src/config.cpp
View file

@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "ns.h" // Must come before everything else!
#include "duke3d.h"
#include "scriplib.h"
#include "osdcmds.h"
#include "renderlayer.h"
#include "cmdline.h"

1
source/duke3d/src/gameexec.cpp
View file

@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "menus.h"
#include "osdcmds.h"
#include "savegame.h"
#include "scriplib.h"
#include "gamecvars.h"
#include "gamecontrol.h"
#include "gameconfigfile.h"

225
source/mact/include/scriplib.h
View file

@ -1,225 +0,0 @@
//-------------------------------------------------------------------------
/*
Copyright (C) 1996, 2003 - 3D Realms Entertainment
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
Duke Nukem 3D is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Original Source: 1996 - Todd Replogle
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
*/
//-------------------------------------------------------------------------
#pragma once
#ifndef scriplib_public_h_
#define scriplib_public_h_
/*
==============
=
= SCRIPT_Init
=
==============
*/
int32_t SCRIPT_Init( char const * name );
/*
==============
=
= SCRIPT_Free
=
==============
*/
void SCRIPT_Free( int32_t scripthandle );
/*
==============
=
= SCRIPT_Load
=
==============
*/
int32_t SCRIPT_Load ( char const * filename );
/*
==============
=
= SCRIPT_Save
=
==============
*/
void SCRIPT_Save (int32_t scripthandle, char const * filename);
/*
==============
=
= SCRIPT_NumberSections
=
==============
*/
int32_t SCRIPT_NumberSections( int32_t scripthandle );
/*
==============
=
= SCRIPT_Section
=
==============
*/
char const * SCRIPT_Section( int32_t scripthandle, int32_t which );
/*
==============
=
= SCRIPT_NumberEntries
=
==============
*/
int32_t SCRIPT_NumberEntries( int32_t scripthandle, char const * sectionname );
/*
==============
=
= SCRIPT_Entry
=
==============
*/
char const * SCRIPT_Entry( int32_t scripthandle, char const * sectionname, int32_t which );
/*
==============
=
= SCRIPT_GetRaw
=
==============
*/
char const * SCRIPT_GetRaw(int32_t scripthandle, char const * sectionname, char const * entryname);
/*
==============
=
= SCRIPT_GetString
=
==============
*/
int32_t SCRIPT_GetStringPtr(int32_t scripthandle, char const *sectionname, char const *entryname, char **dest);
int32_t SCRIPT_GetString(int32_t scripthandle, char const *sectionname, char const *entryname, char *dest);
/*
==============
=
= SCRIPT_GetDoubleString
=
==============
*/
int32_t SCRIPT_GetDoubleString(int32_t scripthandle, const char *sectionname, const char *entryname, char *dest1,
char *dest2);
/*
==============
=
= SCRIPT_GetNumber
=
==============
*/
int32_t SCRIPT_GetNumber(int32_t scripthandle, const char *sectionname, const char *entryname, int32_t *number);
/*
==============
=
= SCRIPT_GetBoolean
=
==============
*/
int32_t SCRIPT_GetBoolean(int32_t scripthandle, char const *sectionname, char const *entryname, int32_t *boole);
/*
==============
=
= SCRIPT_PutSection
=
==============
*/
void SCRIPT_PutSection( int32_t scripthandle, char const * sectionname );
/*
==============
=
= SCRIPT_PutRaw
=
==============
*/
void SCRIPT_PutRaw(int32_t scripthandle, char const * sectionname, char const * entryname, char const * raw);
/*
==============
=
= SCRIPT_PutString
=
==============
*/
void SCRIPT_PutString(int32_t scripthandle, char const *sectionname, char const *entryname, const char *string);
/*
==============
=
= SCRIPT_PutDoubleString
=
==============
*/
void SCRIPT_PutDoubleString(int32_t scripthandle, const char *sectionname, const char *entryname, const char *string1,
const char *string2);
/*
==============
=
= SCRIPT_PutNumber
=
==============
*/
void SCRIPT_PutNumber(int32_t scripthandle, const char *sectionname, const char *entryname, int32_t number,
int32_t hexadecimal, int32_t defaultvalue);
/*
==============
=
= SCRIPT_PutBoolean
=
==============
*/
void SCRIPT_PutBoolean(int32_t scripthandle, char *sectionname, char *entryname, int32_t boole);
/*
==============
=
= SCRIPT_PutDouble
=
==============
*/
void SCRIPT_PutDouble(int32_t scripthandle, char *sectionname, char *entryname, double number, int32_t defaultvalue);
#endif

202
source/mact/src/_scrplib.h
View file

@ -1,202 +0,0 @@
//-------------------------------------------------------------------------
/*
Copyright (C) 1996, 2003 - 3D Realms Entertainment
This file is NOT part of Duke Nukem 3D version 1.5 - Atomic Edition
However, it is either an older version of a file that is, or is
some test code written during the development of Duke Nukem 3D.
This file is provided purely for educational interest.
Duke Nukem 3D is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
*/
//-------------------------------------------------------------------------
#pragma once
#ifndef scriplib_private_h_
#define scriplib_private_h_
#define SCRIPTSECTIONSTART ('[')
#define SCRIPTSECTIONEND (']')
#define SCRIPTENTRYSEPARATOR ('=')
#define SCRIPTCOMMENT (';')
#define SCRIPTEOL ('\n')
#define SCRIPTNULL ('\0')
#define SCRIPTSTRINGSEPARATOR ('"')
#define SCRIPTHEXFIRST ('0')
#define SCRIPTHEXSECOND ('x')
#define SCRIPTSPACE (' ')
#define SCRIPTDEFAULTVALUE ('~')
#define MAXSCRIPTFILES 20
#define SCRIPT(scripthandle,item) (scriptfiles[(scripthandle)]->item)
typedef enum
{
linetype_comment,
linetype_section,
linetype_entry
} linetype_t;
typedef struct scriptline
{
int32_t type;
void * ptr;
struct scriptline *nextline;
struct scriptline *prevline;
} ScriptLineType;
typedef struct scriptentry
{
char * name;
char * value;
struct scriptentry *nextentry;
struct scriptentry *preventry;
} ScriptEntryType;
typedef struct scriptsection
{
char * name;
ScriptEntryType *entries;
ScriptLineType *lastline;
struct scriptsection *nextsection;
struct scriptsection *prevsection;
} ScriptSectionType;
typedef struct
{
ScriptSectionType * apScript;
ScriptSectionType * lastsection;
ScriptLineType * scriptlines;
char scriptfilename[128];
} script_t;
/*
==============
=
= SCRIPT_New
=
==============
*/
int32_t SCRIPT_New( void );
/*
==============
=
= SCRIPT_Delete
=
==============
*/
void SCRIPT_Delete( int32_t scripthandle );
/*
==============
=
= SCRIPT_FreeSection
=
==============
*/
void SCRIPT_FreeSection( ScriptSectionType * section );
/*
==============
=
= SafeWriteString
=
==============
*/
void SafeWriteString (int32_t handle, char * string);
/*
==============
=
= SCRIPT_AddLine
=
==============
*/
ScriptLineType * SCRIPT_AddLine
(
ScriptLineType * root,
int32_t type,
void * ptr
);
/*
==============
=
= SCRIPT_SectionExists
=
==============
*/
ScriptSectionType * SCRIPT_SectionExists
(
int32_t scripthandle,
const char * sectionname
);
/*
==============
=
= SCRIPT_AddSection
=
==============
*/
ScriptSectionType * SCRIPT_AddSection( int32_t scripthandle, const char * sectionname );
/*
==============
=
= SCRIPT_EntryExists
=
==============
*/
ScriptEntryType * SCRIPT_EntryExists
(
ScriptSectionType * section,
const char * entryname
);
/*
==============
=
= SCRIPT_AddEntry
=
==============
*/
void SCRIPT_AddEntry
(
int32_t scripthandle,
const char * sectionname,
const char * entryname,
const char * entryvalue
);
/*
==============
=
= SCRIPT_DecodeToken
=
==============
*/
void SCRIPT_DecodeToken ( int32_t scripthandle, char * str );
#endif

920
source/mact/src/scriplib.cpp
View file

@ -1,920 +0,0 @@
/*
* scriplib.c
* MACT library Script file parsing and writing
*
* by Jonathon Fowler
*
* Since we weren't given the source for MACT386.LIB so I've had to do some
* creative interpolation here.
*
* This all should be rewritten in a much much cleaner fashion.
*
*/
//-------------------------------------------------------------------------
/*
Duke Nukem Copyright (C) 1996, 2003 3D Realms Entertainment
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
Duke Nukem 3D is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "compat.h"
#include "scriplib.h"
#include "_scrplib.h"
#include "vfs.h"
static script_t *scriptfiles[MAXSCRIPTFILES];
#define SC(s) scriptfiles[s]
int32_t SCRIPT_New(void)
{
int32_t i;
for (i=0; i<MAXSCRIPTFILES; i++)
{
if (!SC(i))
{
SC(i) = (script_t *)Xmalloc(sizeof(script_t));
memset(SC(i), 0, sizeof(script_t));
return i;
}
}
return -1;
}
void SCRIPT_Delete(int32_t scripthandle)
{
ScriptSectionType *s;
if (scripthandle < 0 || scripthandle >= MAXSCRIPTFILES) return;
if (!SC(scripthandle)) return;
if (SCRIPT(scripthandle,apScript))
{
while (SCRIPT(scripthandle,apScript)->nextsection != SCRIPT(scripthandle,apScript))
{
s = SCRIPT(scripthandle,apScript)->nextsection;
SCRIPT_FreeSection(SCRIPT(scripthandle,apScript));
Xfree(SCRIPT(scripthandle,apScript));
SCRIPT(scripthandle,apScript) = s;
}
SCRIPT_FreeSection(SCRIPT(scripthandle, apScript));
Xfree(SCRIPT(scripthandle,apScript));
}
Xfree(SC(scripthandle));
SC(scripthandle) = 0;
}
void SCRIPT_FreeSection(ScriptSectionType * section)
{
ScriptEntryType *e;
if (!section) return;
if (!section->entries) return;
while (section->entries->nextentry != section->entries)
{
e = section->entries->nextentry;
Xfree(section->entries->name);
Xfree(section->entries->value);
Xfree(section->entries);
section->entries = e;
}
Xfree(section->entries->name);
Xfree(section->entries->value);
Xfree(section->entries);
Xfree(section->name);
}
#define AllocSection(s) \
{ \
(s) = (ScriptSectionType *)Xmalloc(sizeof(ScriptSectionType)); \
(s)->name = NULL; \
(s)->entries = NULL; \
(s)->lastline = NULL; \
(s)->nextsection = (s); \
(s)->prevsection = (s); \
}
#define AllocEntry(e) \
{ \
(e) = (ScriptEntryType *)Xmalloc(sizeof(ScriptEntryType)); \
(e)->name = NULL; \
(e)->value = NULL; \
(e)->nextentry = (e); \
(e)->preventry = (e); \
}
ScriptSectionType * SCRIPT_SectionExists(int32_t scripthandle, const char * sectionname)
{
ScriptSectionType *s, *ls=NULL;
if (scripthandle < 0 || scripthandle >= MAXSCRIPTFILES) return NULL;
if (!sectionname) return NULL;
if (!SC(scripthandle)) return NULL;
if (!SCRIPT(scripthandle,apScript)) return NULL;
for (s = SCRIPT(scripthandle,apScript); ls != s; ls=s,s=s->nextsection)
if (!Bstrcasecmp(s->name, sectionname)) return s;
return NULL;
}
ScriptSectionType * SCRIPT_AddSection(int32_t scripthandle, const char * sectionname)
{
ScriptSectionType *s,*s2;
if (scripthandle < 0 || scripthandle >= MAXSCRIPTFILES) return NULL;
if (!sectionname) return NULL;
if (!SC(scripthandle)) return NULL;
s = SCRIPT_SectionExists(scripthandle, sectionname);
if (s) return s;
AllocSection(s);
s->name = Xstrdup(sectionname);
if (!SCRIPT(scripthandle,apScript))
{
SCRIPT(scripthandle,apScript) = s;
}
else
{
s2 = SCRIPT(scripthandle,apScript);
while (s2->nextsection != s2) s2=s2->nextsection;
s2->nextsection = s;
s->prevsection = s2;
}
return s;
}
ScriptEntryType * SCRIPT_EntryExists(ScriptSectionType * section, const char * entryname)
{
ScriptEntryType *e,*le=NULL;
if (!section) return NULL;
if (!entryname) return NULL;
if (!section->entries) return NULL;
for (e = section->entries; le != e; le=e,e=e->nextentry)
if (!Bstrcasecmp(e->name, entryname)) return e;
return NULL;
}
void SCRIPT_AddEntry(int32_t scripthandle, const char * sectionname, const char * entryname, const char * entryvalue)
{
ScriptSectionType *s;
ScriptEntryType *e,*e2;
if (scripthandle < 0 || scripthandle >= MAXSCRIPTFILES) return;
if (!sectionname || !entryname || !entryvalue) return;
if (!SC(scripthandle)) return;
// s = SCRIPT_SectionExists(scripthandle, sectionname);
// if (!s) {
s = SCRIPT_AddSection(scripthandle, sectionname);
if (!s) return;
// }
e = SCRIPT_EntryExists(s, entryname);
if (!e)
{
AllocEntry(e);
e->name = Xstrdup(entryname);
if (!s->entries)
{
s->entries = e;
}
else
{
e2 = s->entries;
while (e2->nextentry != e2) e2=e2->nextentry;
e2->nextentry = e;
e->preventry = e2;
}
}
Xfree(e->value);
e->value = Xstrdup(entryvalue);
}
int32_t SCRIPT_ParseBuffer(int32_t scripthandle, char *data, int32_t length)
{
if (!data || length < 0) return 1;
char const *currentsection = "";
char const *currententry = NULL;
char const *currentvalue = NULL;
char *fence = data + length;
char ch = 0;
char lastch = 0;
enum
{
ParsingIdle,
ParsingSectionBegin,
ParsingSectionName,
ParsingEntry,
ParsingValueBegin,
ParsingValue
};
enum
{
ExpectingSection = 1,
ExpectingEntry = 2,
ExpectingAssignment = 4,
ExpectingValue = 8,
ExpectingComment = 16
};
#define SETERR(v) do { if (v>errlevel||errlevel==0) errlevel=v; } while (0)
char *sp = data;
char *dp = data;
int state = ParsingIdle;
int expect = ExpectingSection | ExpectingEntry;
int linenum = 1;
int errlevel = 0;
#define EATLINE(p) while (length > 0 && *p != '\n' && *p != '\r') { p++; length--; }
#define LETTER() { lastch = ch; ch = *(sp++); length--; }
while (length > 0)
{
switch (state)
{
case ParsingIdle:
LETTER();
switch (ch)
{
// whitespace
case ' ':
case '\t': continue;
case '\n': if (lastch == '\r') continue; linenum++; continue;
case '\r': linenum++; continue;
case ';':
/*case '#':*/
EATLINE(sp);
continue;
case '[': if (!(expect & ExpectingSection))
{
// Unexpected section start
printf("Unexpected start of section on line %d.\n", linenum);
SETERR(-1);
EATLINE(sp);
continue;
}
else
{
state = ParsingSectionBegin;
continue;
}
default: if (isalpha(ch))
{
if (!(expect & ExpectingEntry))
{
// Unexpected name start
printf("Unexpected entry LabelText on line %d.\n", linenum);
SETERR(-1);
EATLINE(sp);
continue;
}
else
{
currententry = dp = sp-1;
state = ParsingEntry;
continue;
}
}
else
{
// Unexpected character
printf("Illegal character (ASCII %d) on line %d.\n", ch, linenum);
SETERR(-1);
EATLINE(sp);
continue;
}
}
case ParsingSectionBegin:
currentsection = dp = sp;
state = ParsingSectionName;
fallthrough__;
case ParsingSectionName:
LETTER();
switch (ch)
{
case '\n':
case '\r': // Unexpected newline
printf("Unexpected newline on line %d.\n", linenum);
SETERR(-1);
state = ParsingIdle;
linenum++;
continue;
case ']':
*(dp) = 0; // Add new section
expect = ExpectingSection | ExpectingEntry;
state = ParsingIdle;
EATLINE(sp);
continue;
default:
dp++;
continue;
}
case ParsingEntry:
LETTER();
switch (ch)
{
case ';':
/*case '#':*/
// unexpected comment
EATLINE(sp);
printf("Unexpected comment on line %d.\n", linenum);
SETERR(-1);
fallthrough__;
case '\n':
case '\r':
// Unexpected newline
printf("Unexpected newline on line %d.\n", linenum);
SETERR(-1);
expect = ExpectingSection | ExpectingEntry;
state = ParsingIdle;
linenum++;
continue;
case '=':
// Entry name finished, now for the value
while (*dp == ' ' || *dp == '\t') dp--;
*(++dp) = 0;
state = ParsingValueBegin;
continue;
default:
dp++;
continue;
}
case ParsingValueBegin:
currentvalue = dp = sp;
state = ParsingValue;
fallthrough__;
case ParsingValue:
LETTER();
switch (ch)
{
case '\n':
case '\r':
// value complete, add it using parsed name
while (*dp == ' ' || *dp == '\t') dp--;
*(dp) = 0;
while (*currentvalue == ' ' || *currentvalue == '\t') currentvalue++;
state = ParsingIdle;
linenum++;
SCRIPT_AddSection(scripthandle,currentsection);
SCRIPT_AddEntry(scripthandle,currentsection,currententry,currentvalue);
continue;
default:
dp++;
continue;
}
default: length=0;
continue;
}
}
if (sp > fence) printf("Stepped outside the fence!\n");
return errlevel;
}
//---
int32_t SCRIPT_Init(char const * name)
{
int32_t h = SCRIPT_New();
if (h >= 0) Bstrncpy(SCRIPT(h,scriptfilename), name, 127);
return h;
}
void SCRIPT_Free(int32_t scripthandle)
{
SCRIPT_Delete(scripthandle);
}
int32_t SCRIPT_Load(char const * filename)
{
int32_t s,l;
char *b;
buildvfs_fd h;
h = buildvfs_open_read(filename);
l = (int32_t)buildvfs_length(h)+1;
b = (char *)Xmalloc(l);
buildvfs_read(h,b,l-1);
b[l-1] = '\n'; // JBF 20040111: evil nasty hack to trick my evil nasty parser
buildvfs_close(h);
s = SCRIPT_Init(filename);
if (s<0)
{
Xfree(b);
return -1;
}
SCRIPT_ParseBuffer(s,b,l);
Xfree(b);
return s;
}
void SCRIPT_Save(int32_t scripthandle, char const * filename)
{
char const *section, *entry, *value;
int32_t sec, ent, numsect, nument;
buildvfs_FILE fp;
if (!filename) return;
if (!SC(scripthandle)) return;
fp = buildvfs_fopen_write_text(filename);
if (!fp) return;
numsect = SCRIPT_NumberSections(scripthandle);
for (sec=0; sec<numsect; sec++)
{
section = SCRIPT_Section(scripthandle, sec);
if (sec>0)
buildvfs_fputc('\n', fp);
if (section[0] != 0)
{
buildvfs_fputc('[', fp);
buildvfs_fputstrptr(fp, section);
buildvfs_fputstr(fp, "]\n");
}
nument = SCRIPT_NumberEntries(scripthandle,section);
for (ent=0; ent<nument; ent++)
{
entry = SCRIPT_Entry(scripthandle,section,ent);
value = SCRIPT_GetRaw(scripthandle,section,entry);
buildvfs_fputstrptr(fp, entry);
buildvfs_fputstr(fp, " = ");
buildvfs_fputstrptr(fp, value);
buildvfs_fputc('\n', fp);
}
}
buildvfs_fclose(fp);
}
int32_t SCRIPT_NumberSections(int32_t scripthandle)
{
int32_t c=0;
ScriptSectionType *s,*ls=NULL;
if (!SC(scripthandle)) return 0;
if (!SCRIPT(scripthandle,apScript)) return 0;
for (s = SCRIPT(scripthandle,apScript); ls != s; ls=s,s=s->nextsection) c++;
return c;
}
char const * SCRIPT_Section(int32_t scripthandle, int32_t which)
{
ScriptSectionType *s,*ls=NULL;
if (!SC(scripthandle)) return "";
if (!SCRIPT(scripthandle,apScript)) return "";
for (s = SCRIPT(scripthandle,apScript); which>0 && ls != s; ls=s, s=s->nextsection, which--) ;
return s->name;
}
int32_t SCRIPT_NumberEntries(int32_t scripthandle, char const * sectionname)
{
ScriptSectionType *s;
ScriptEntryType *e,*le=NULL;
int32_t c=0;
if (!SC(scripthandle)) return 0;
if (!SCRIPT(scripthandle,apScript)) return 0;
s = SCRIPT_SectionExists(scripthandle, sectionname);
if (!s) return 0;
for (e = s->entries; le != e; le=e,e=e->nextentry) c++;
return c;
}
char const * SCRIPT_Entry(int32_t scripthandle, char const * sectionname, int32_t which)
{
ScriptSectionType *s;
ScriptEntryType *e,*le=NULL;
if (!SC(scripthandle)) return 0;
if (!SCRIPT(scripthandle,apScript)) return 0;
s = SCRIPT_SectionExists(scripthandle, sectionname);
if (!s) return "";
for (e = s->entries; which>0 && le != e; le=e, e=e->nextentry, which--) ;
return e->name;
}
char const * SCRIPT_GetRaw(int32_t scripthandle, char const * sectionname, char const * entryname)
{
ScriptSectionType *s;
ScriptEntryType *e;
if (!SC(scripthandle)) return 0;
if (!SCRIPT(scripthandle,apScript)) return 0;
s = SCRIPT_SectionExists(scripthandle, sectionname);
e = SCRIPT_EntryExists(s, entryname);
if (!e) return "";
return e->value;
}
static char * SCRIPT_ParseString(char ** dest, char * p)
{
int32_t c = 0;
char ch;
if (!(*dest))
{
// find length
char *q = p;
if (*q == '\"')
{
// quoted string
q++;
while ((ch = *(q++)) && ch != '\"')
{
if (ch == '\\')
{
ch = *(q++);
if (!ch)
break;
}
c++;
}
}
else
{
while ((ch = *(q++)) && ch != ' ' && ch != '\t')
c++;
}
// allocate
*dest = (char*)Xcalloc(c+1,sizeof(char));
c = 0;
}
if (*p == '\"')
{
// quoted string
p++;
while ((ch = *(p++)))
{
switch (ch)
{
case '\\':
ch = *(p++);
switch (ch)
{
case 0: return p;
case 'n': (*dest)[c++] = '\n'; break;
case 'r': (*dest)[c++] = '\r'; break;
case 't': (*dest)[c++] = '\t'; break;
default: (*dest)[c++] = ch; break;
}
break;
case '\"':
(*dest)[c] = 0;
return p;
default:
(*dest)[c++] = ch;
break;
}
}
return p;
}
else
{
while ((ch = *(p++)))
{
if (ch == ' ' || ch == '\t') { (*dest)[c] = 0; break; }
else (*dest)[c++] = ch;
}
}
return p;
}
int32_t SCRIPT_GetStringPtr(int32_t scripthandle, char const * sectionname, char const * entryname, char ** dest)
{
ScriptSectionType *s;
ScriptEntryType *e;
char *p;
if (!SC(scripthandle)) return 1;
if (!SCRIPT(scripthandle,apScript)) return 1;
s = SCRIPT_SectionExists(scripthandle, sectionname);
e = SCRIPT_EntryExists(s, entryname);
//dest[0] = 0;
if (!e) return 1;
p = e->value;
SCRIPT_ParseString(dest, p);
return 0;
}
int32_t SCRIPT_GetString(int32_t scripthandle, char const * sectionname, char const * entryname, char * dest)
{
return SCRIPT_GetStringPtr(scripthandle, sectionname, entryname, &dest);
}
int32_t SCRIPT_GetDoubleString(int32_t scripthandle, const char * sectionname, const char * entryname, char * dest1, char * dest2)
{
ScriptSectionType *s;
ScriptEntryType *e;
char *p;
if (!SC(scripthandle)) return 1;
if (!SCRIPT(scripthandle,apScript)) return 1;
s = SCRIPT_SectionExists(scripthandle, sectionname);
e = SCRIPT_EntryExists(s, entryname);
//dest1[0] = 0;
//dest2[0] = 0;
if (!e) return 1;
p = e->value;
p = SCRIPT_ParseString(&dest1, p);
if (*(p-1) != '\"')
return 0;
while (*p == ' ' || *p == '\t') p++;
if (*p == 0) return 0;
SCRIPT_ParseString(&dest2, p);
return 0;
}
int32_t SCRIPT_GetNumber(int32_t scripthandle, const char * sectionname, const char * entryname, int32_t * number)
{
ScriptSectionType *s;
ScriptEntryType *e;
char *p;
if (!SC(scripthandle)) return 1;
if (!SCRIPT(scripthandle,apScript)) return 1;
s = SCRIPT_SectionExists(scripthandle, sectionname);
e = SCRIPT_EntryExists(s, entryname);
if (!e) return 1;// *number = 0;
else
{
if (e->value[0] == '0' && e->value[1] == 'x')
{
// hex
*number = strtol(e->value+2, &p, 16);
if (p == e->value+2 || (*p != 0 && *p != ' ' && *p != '\t')) return 1;
}
else
{
// decimal
*number = strtol(e->value, &p, 10);
if (p == e->value || (*p != 0 && *p != ' ' && *p != '\t')) return 1;
}
}
return 0;
}
int32_t SCRIPT_GetBoolean(int32_t scripthandle, char const * sectionname, char const * entryname, int32_t * boole)
{
ScriptSectionType *s;
ScriptEntryType *e;
if (!SC(scripthandle)) return 1;
if (!SCRIPT(scripthandle,apScript)) return 1;
s = SCRIPT_SectionExists(scripthandle, sectionname);
e = SCRIPT_EntryExists(s, entryname);
if (!e) return 1;// *boole = 0;
else
{
if (!Bstrncasecmp(e->value, "true", 4)) *boole = 1;
else if (!Bstrncasecmp(e->value, "false", 5)) *boole = 0;
else if (e->value[0] == '1' && (e->value[1] == ' ' || e->value[1] == '\t' || e->value[1] == 0)) *boole = 1;
else if (e->value[0] == '0' && (e->value[1] == ' ' || e->value[1] == '\t' || e->value[1] == 0)) *boole = 0;
}
return 0;
}
void SCRIPT_PutSection(int32_t scripthandle, char const * sectionname)
{
SCRIPT_AddSection(scripthandle, sectionname);
}
void SCRIPT_PutRaw(int32_t scripthandle, char const *sectionname, char const *entryname, char const *raw)
{
SCRIPT_AddEntry(scripthandle, sectionname, entryname, raw);
}
void SCRIPT_PutString(int32_t scripthandle, char const *sectionname, char const *entryname, const char *string)
{
const char *q;
char *raw,*p;
int32_t len = 3;
if (!string) string = "";
for (q=string; *q; q++)
{
if (*q == '\r' || *q == '\n' || *q == '\t' || *q == '\\' || *q == '"') len+=2;
else if (*q >= ' ') len++;
}
p = raw = (char *)Xmalloc(len);
*(p++) = '"';
for (q=string; *q; q++)
{
if (*q == '\r') { *(p++) = '\\'; *(p++) = 'r'; }
else if (*q == '\n') { *(p++) = '\\'; *(p++) = 'n'; }
else if (*q == '\t') { *(p++) = '\\'; *(p++) = 't'; }
else if (*q == '\\' || *q == '"') { *(p++) = '\\'; *(p++) = *q; }
else if (*q >= ' ') *(p++) = *q;
}
*(p++) = '"';
*p=0;
SCRIPT_AddEntry(scripthandle, sectionname, entryname, raw);
Xfree(raw);
}
void SCRIPT_PutDoubleString
(
int32_t scripthandle,
const char * sectionname,
const char * entryname,
const char * string1,
const char * string2
)
{
const char *q;
char *raw,*p;
int32_t len = 6;
if (!string1) string1 = "";
if (!string2) string2 = "";
for (q=string1; *q; q++)
{
if (*q == '\r' || *q == '\n' || *q == '\t' || *q == '\\' || *q == '"') len+=2;
else if (*q >= ' ') len++;
}
for (q=string2; *q; q++)
{
if (*q == '\r' || *q == '\n' || *q == '\t' || *q == '\\' || *q == '"') len+=2;
else if (*q >= ' ') len++;
}
p = raw = (char *)Xmalloc(len);
*(p++) = '"';
for (q=string1; *q; q++)
{
if (*q == '\r') { *(p++) = '\\'; *(p++) = 'r'; }
else if (*q == '\n') { *(p++) = '\\'; *(p++) = 'n'; }
else if (*q == '\t') { *(p++) = '\\'; *(p++) = 't'; }
else if (*q == '\\' || *q == '"') { *(p++) = '\\'; *(p++) = *q; }
else if (*q >= ' ') *(p++) = *q;
}
*(p++) = '"';
*(p++) = ' ';
*(p++) = '"';
for (q=string2; *q; q++)
{
if (*q == '\r') { *(p++) = '\\'; *(p++) = 'r'; }
else if (*q == '\n') { *(p++) = '\\'; *(p++) = 'n'; }
else if (*q == '\t') { *(p++) = '\\'; *(p++) = 't'; }
else if (*q == '\\' || *q == '"') { *(p++) = '\\'; *(p++) = *q; }
else if (*q >= ' ') *(p++) = *q;
}
*(p++) = '"';
*p=0;
SCRIPT_AddEntry(scripthandle, sectionname, entryname, raw);
Xfree(raw);
}
void SCRIPT_PutNumber
(
int32_t scripthandle,
const char * sectionname,
const char * entryname,
int32_t number,
int32_t hexadecimal,
int32_t defaultvalue
)
{
char raw[64];
UNREFERENCED_PARAMETER(defaultvalue);
if (hexadecimal) Bsprintf(raw, "0x%X", number);
else Bsprintf(raw, "%d", number);
SCRIPT_AddEntry(scripthandle, sectionname, entryname, raw);
}
void SCRIPT_PutBoolean
(
int32_t scripthandle,
char * sectionname,
char * entryname,
int32_t boole
)
{
char raw[2] = "0";
if (boole) raw[0] = '1';
SCRIPT_AddEntry(scripthandle, sectionname, entryname, raw);
}
void SCRIPT_PutDouble
(
int32_t scripthandle,
char * sectionname,
char * entryname,
double number,
int32_t defaultvalue
)
{
char raw[64];
UNREFERENCED_PARAMETER(defaultvalue);
Bsprintf(raw, "%g", number);
SCRIPT_AddEntry(scripthandle, sectionname, entryname, raw);
}

1
source/rr/src/config.cpp
View file

@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "ns.h" // Must come before everything else!
#include "duke3d.h"
#include "scriplib.h"
#include "osdcmds.h"
#include "renderlayer.h"
#include "cmdline.h"

1
source/rr/src/gameexec.cpp
View file

@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "menus.h"
#include "osdcmds.h"
#include "savegame.h"
#include "scriplib.h"
#include "gamecvars.h"
#include "debugbreak.h"

1
source/sw/src/anim.cpp
View file

@ -32,7 +32,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "mytypes.h"
#include "fx_man.h"
#include "music.h"
#include "scriplib.h"
#include "gamedefs.h"
#include "keyboard.h"

1
source/sw/src/config.cpp
View file

@ -32,7 +32,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "settings.h"
#include "mytypes.h"
#include "scriplib.h"
#include "gamedefs.h"
#include "keyboard.h"
#include "gamecontrol.h"

5
source/sw/src/inv.cpp
View file

@ -584,7 +584,10 @@ DoPlayerNightVisionPalette(PLAYERp pp)
memcpy(pp->temp_pal, palette_data, sizeof(palette_data));
memcpy(palookup[PALETTE_DEFAULT], DefaultPalette, 256 * 32);
pp->FadeAmt = 0;
videoFadePalette(0,0,0,0);
if (videoGetRenderMode() < REND_POLYMOST)
COVERsetbrightness(0, &palette_data[0][0]);
else
videoFadePalette(0,0,0,0);
}
pp->NightVision = FALSE;
}

10
source/sw/src/player.cpp
View file

@ -5048,7 +5048,10 @@ DoPlayerDivePalette(PLAYERp pp)
{
memcpy(pp->temp_pal, palette_data, sizeof(palette_data));
memcpy(palookup[PALETTE_DEFAULT], DefaultPalette, 256 * 32);
videoFadePalette(0,0,0,0);
if (videoGetRenderMode() < REND_POLYMOST)
COVERsetbrightness(0, &palette_data[0][0]);
else
videoFadePalette(0,0,0,0);
pp->FadeAmt = 0;
}
}
@ -6900,7 +6903,10 @@ void DoPlayerDeathCheckKeys(PLAYERp pp)
if (pp == Player + screenpeek)
{
videoFadePalette(0,0,0,0);
if (videoGetRenderMode() < REND_POLYMOST)
COVERsetbrightness(0,&palette_data[0][0]);
else
videoFadePalette(0,0,0,0);
//memcpy(&palette_data[0][0],&palette_data[0][0],768);
memcpy(&pp->temp_pal[0],&palette_data[0][0],768);
}

2
source/sw/src/setup.cpp
View file

@ -32,7 +32,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "mytypes.h"
#include "fx_man.h"
#include "music.h"
#include "scriplib.h"
#include "gamedefs.h"
#include "keyboard.h"
@ -132,7 +131,6 @@ void TermSetup(void)
#include "sndcards.h"
#include "fx_man.h"
#include "music.h"
#include "scriplib.h"
#include "gamedefs.h"
#include "keyboard.h"

1
source/sw/src/swconfig.cpp
View file

@ -33,7 +33,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
//#include "settings.h"
#include "mytypes.h"
#include "scriplib.h"
#include "fx_man.h"
#include "gamedefs.h"
#include "common_game.h"