Browse Source

remove the remaining prefixes

pull/83/head
Alison Watson 1 year ago
parent
commit
ab58d6f854
50 changed files with 168 additions and 168 deletions
  1. BIN
      pk7/acs/lithmain.bin
  2. +2
    -2
      pk7/lzscript/Constants/w_scorenums.zsc
  3. +1
    -1
      source/d_stmt.c
  4. +3
    -3
      source/d_vm.c
  5. +4
    -4
      source/debug.c
  6. +1
    -1
      source/include/items.h
  7. +7
    -7
      source/include/m_drawing.h
  8. +1
    -1
      source/include/m_memory.h
  9. +2
    -2
      source/include/m_stab.h
  10. +20
    -20
      source/include/m_version.h
  11. +4
    -4
      source/include/p_data.h
  12. +1
    -1
      source/include/p_hud.h
  13. +18
    -18
      source/include/p_player.h
  14. +9
    -9
      source/include/w_data.h
  15. +1
    -1
      source/include/w_monster.h
  16. +1
    -1
      source/p_bip.c
  17. +1
    -1
      source/p_cbi.c
  18. +1
    -1
      source/p_data.c
  19. +3
    -3
      source/p_hud.c
  20. +5
    -5
      source/p_items.c
  21. +1
    -1
      source/p_log.c
  22. +5
    -5
      source/p_magic.c
  23. +1
    -1
      source/p_obituary.c
  24. +6
    -6
      source/p_player.c
  25. +8
    -8
      source/p_powerup.c
  26. +9
    -9
      source/p_weapons.c
  27. +2
    -2
      source/u_flashlight.c
  28. +1
    -1
      source/u_headsupdisc.c
  29. +1
    -1
      source/u_headsupdisd.c
  30. +1
    -1
      source/u_headsupdisi.c
  31. +1
    -1
      source/u_headsupdism.c
  32. +1
    -1
      source/u_homingrpg.c
  33. +1
    -1
      source/u_magic.c
  34. +1
    -1
      source/u_punctcannon.c
  35. +1
    -1
      source/u_reactarmor.c
  36. +1
    -1
      source/u_reflexwetw.c
  37. +2
    -2
      source/u_riflemodes.c
  38. +3
    -3
      source/u_subweapons.c
  39. +1
    -1
      source/u_zoom.c
  40. +7
    -7
      source/w_boss.c
  41. +2
    -2
      source/w_cbi.c
  42. +1
    -1
      source/w_cyberspace.c
  43. +4
    -4
      source/w_misc.c
  44. +3
    -3
      source/w_monster.c
  45. +1
    -1
      source/w_spawn.c
  46. +1
    -1
      source/w_time.c
  47. +12
    -12
      source/w_world.c
  48. +1
    -1
      tools/decompat.rb
  49. +1
    -1
      tools/upgc.rb
  50. +3
    -3
      tools/wepc.rb

BIN
pk7/acs/lithmain.bin View File


+ 2
- 2
pk7/lzscript/Constants/w_scorenums.zsc View File

@@ -24,7 +24,7 @@
* ---------------------------------------------------------------------------|
*/

enum ScoreNum
enum Lith_ScoreNum
{
/* Score values */
Score_Clip = 1000,
@@ -73,7 +73,7 @@ enum ScoreNum
Score_AIMainframe = Score_DSparil,
};

enum EXPNum
enum Lith_EXPNum
{
/* Tier 1 */
Exp_ZombieMan = 5,


+ 1
- 1
source/d_stmt.c View File

@@ -45,7 +45,7 @@ void Dlg_GetStmt_Cond(struct compiler *d)
Dlg_PushB2(d, VAR_PCLASS);

Dlg_PushB1(d, DCD_CMP_VI);
#define LITH_X(shr, lng) \
#define PCL(shr, lng) \
if(faststrcmp(tok->textV, #shr) == 0) {Dlg_PushB1(d, shr); goto ok;}
#include "p_player.h"
ErrT(d, tok, "invalid playerclass type");


+ 3
- 3
source/d_vm.c View File

@@ -957,7 +957,7 @@ halt:

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_RunProgram")
script_str ext("ACS") addr(OBJ "RunProgram")
void Sc_RunProgram(i32 num) {
with_player(LocalPlayer) {
if(!p->dlg.active) {
@@ -967,7 +967,7 @@ void Sc_RunProgram(i32 num) {
}
}

script_str ext("ACS") addr("Lith_RunDialogue")
script_str ext("ACS") addr(OBJ "RunDialogue")
void Sc_RunDialogue(i32 num) {
with_player(LocalPlayer) {
if(!p->dlg.active) {
@@ -978,7 +978,7 @@ void Sc_RunDialogue(i32 num) {
}
}

script_str ext("ACS") addr("Lith_RunTerminal")
script_str ext("ACS") addr(OBJ "RunTerminal")
void Sc_RunTerminal(i32 num) {
with_player(LocalPlayer) {
if(!p->dlg.active) {


+ 4
- 4
source/debug.c View File

@@ -112,25 +112,25 @@ void Log(cstr fmt, ...)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_GiveEXPToMonster")
script_str ext("ACS") addr(OBJ "GiveEXPToMonster")
void Sc_GiveEXPToMonster(i32 amt)
{
ifauto(dmon_t *, m, DmonPtr(0, AAPTR_PLAYER_GETTARGET)) m->exp += amt;
}

script_str ext("ACS") addr("Lith_GiveMeAllOfTheScore")
script_str ext("ACS") addr(OBJ "GiveMeAllOfTheScore")
void Sc_DbgGiveScore(void)
{
with_player(LocalPlayer) P_Scr_Give(p, INT96_MAX, true);
}

script_str ext("ACS") addr("Lith_DumpAlloc")
script_str ext("ACS") addr(OBJ "DumpAlloc")
void Sc_DbgDumpAlloc(void)
{
__GDCC__alloc_dump();
}

script_str ext("ACS") addr("Lith_PrintMonsterInfo")
script_str ext("ACS") addr(OBJ "PrintMonsterInfo")
void Sc_PrintMonsterInfo(void)
{
extern void PrintMonsterInfo(void);


+ 1
- 1
source/include/items.h View File

@@ -33,7 +33,7 @@ enum {
};
/* decompat-end */

enum /* Lith_Container */ {
enum /* Container */ {
_cont_store,
_cont_arms_u,
_cont_arms_l,


+ 7
- 7
source/include/m_drawing.h View File

@@ -148,11 +148,11 @@
#define StartSound(...) \
DrawCallI(sm_StartSound, __VA_ARGS__)

#define CrBlue "\C[Lith_Blue]"
#define CrGreen "\C[Lith_Green]"
#define CrRed "\C[Lith_Red]"
#define CrPurple "\C[Lith_Purple]"
#define CrGrey "\C[Lith_Grey]"
#define CrBlue "\C[" OBJ "Blue]"
#define CrGreen "\C[" OBJ "Green]"
#define CrRed "\C[" OBJ "Red]"
#define CrPurple "\C[" OBJ "Purple]"
#define CrGrey "\C[" OBJ "Grey]"

enum {
CHANF_LISTENERZ = 8,
@@ -171,7 +171,7 @@ enum {
};
/* decompat-end */

enum /* Lith_FontNum */
enum /* FontNum */
{
font_misaki_gothic,
font_misaki_mincho,
@@ -180,7 +180,7 @@ enum /* Lith_FontNum */
font_num,
};

enum /* Lith_Channel */
enum /* Channel */
{
lch_auto,



+ 1
- 1
source/include/m_memory.h View File

@@ -21,7 +21,7 @@
#define Ralloc_real(p, s) realloc(p, s)
#define Salloc_real(t) calloc(1, sizeof(t))

#if LITH_MEMORY_DEBUG
#if MEMORY_DEBUG
#include <stdio.h>
#include <ACS_ZDoom.h>
#define AllocLog(name) (ACS_BeginPrint(), \


+ 2
- 2
source/include/m_stab.h View File

@@ -157,8 +157,8 @@ X(sm_LS, "LS")
X(sm_LT, "LT")
X(sm_LX, "LX")
X(sm_LZ, "LZ")
X(sm_MapNoRain, "user_Lith_NoRain")
X(sm_MapUseRain, "user_Lith_UseRain")
X(sm_MapNoRain, "user_" OBJ "NoRain")
X(sm_MapUseRain, "user_" OBJ "UseRain")
X(sm_MonsterBarrierLook, "MonsterBarrierLook")
X(sm_Nuke, "Nuke")
X(sm_OnGround, "m_OnGround")


+ 20
- 20
source/include/m_version.h View File

@@ -12,33 +12,33 @@
*/

#define Version "Lithium 1.7 (Yttrium Oxide)"
#define APIVersion Lith_v1_7_0
#define APIVersion v1_7_0
#define CheckAPIVersion() \
if(apiversion != APIVersion) { \
ACS_BeginLog(); \
__nprintf(c"%s: Invalid API version! Expected %i, but got %i\n", \
__func__, Lith_APIVersion, apiversion); \
__func__, APIVersion, apiversion); \
ACS_EndLog(); \
abort(); \
} else (void)0
#include <stdio.h>
#define Lith_v1_7_0 17.0 /* 1.7 (Yttrium Oxide) */
#define Lith_v1_6_3 16.3 /* 1.6.3 (Trilithionite Red) */
#define Lith_v1_6_2 16.2 /* 1.6.2 (Trilithionite) */
#define Lith_v1_6_1 16.1 /* 1.6.1 (Hyper-Trilithium) */
#define Lith_v1_6_0 16.0 /* 1.6 (Hyper-Dilithium) */
#define Lith_v1_5_3 15.3 /* 1.5.3 (Indicolite Pegmatite) */
#define Lith_v1_5_2 15.2 /* 1.5.2 (Rubellite Pegmatite) */
#define Lith_v1_5_1 15.1 /* 1.5.1 (Rubellite Pegmatite) */
#define Lith_v1_5_0 15.04 /* 1.5 (Pegmatite) */
#define Lith_v1_5_0b 15.03 /* 1.5 Beta (Pegmatite) */
#define Lith_v1_5_0a2 15.02 /* 1.5 Alpha 2 (Pegmatite) */
#define Lith_v1_5_0a 15.01 /* 1.5 Alpha (Pegmatite) */
#define Lith_v1_4_0 14.0 /* 1.4 (Lumate) */
#define Lith_v1_3_1 13.1 /* 1.3.1 (LITHIUM - Hell Knights Insist On Dying) */
#define Lith_v1_3_0 13.0 /* 1.3 (Zabuyelite) */
#define Lith_v1_2_0 12.0 /* 1.2 (Lithium Carbonate) */
#define Lith_v1_1_0 11.0 /* 1.1 (Lithium Chloride) */
#define Lith_v1_0_0 10.0 /* 1.0 (Lithium) */
#define v1_7_0 17.0 /* 1.7 (Yttrium Oxide) */
#define v1_6_3 16.3 /* 1.6.3 (Trilithionite Red) */
#define v1_6_2 16.2 /* 1.6.2 (Trilithionite) */
#define v1_6_1 16.1 /* 1.6.1 (Hyper-Trilithium) */
#define v1_6_0 16.0 /* 1.6 (Hyper-Dilithium) */
#define v1_5_3 15.3 /* 1.5.3 (Indicolite Pegmatite) */
#define v1_5_2 15.2 /* 1.5.2 (Rubellite Pegmatite) */
#define v1_5_1 15.1 /* 1.5.1 (Rubellite Pegmatite) */
#define v1_5_0 15.04 /* 1.5 (Pegmatite) */
#define v1_5_0b 15.03 /* 1.5 Beta (Pegmatite) */
#define v1_5_0a2 15.02 /* 1.5 Alpha 2 (Pegmatite) */
#define v1_5_0a 15.01 /* 1.5 Alpha (Pegmatite) */
#define v1_4_0 14.0 /* 1.4 (Lumate) */
#define v1_3_1 13.1 /* 1.3.1 (LITHIUM - Hell Knights Insist On Dying) */
#define v1_3_0 13.0 /* 1.3 (Zabuyelite) */
#define v1_2_0 12.0 /* 1.2 (Lithium Carbonate) */
#define v1_1_0 11.0 /* 1.1 (Lithium Chloride) */
#define v1_0_0 10.0 /* 1.0 (Lithium) */

/* EOF */

+ 4
- 4
source/include/p_data.h View File

@@ -12,7 +12,7 @@
*/
/* decompat-out pk7/lzscript/Constants/p_data.zsc */

enum /* Lith_Attrib */ {
enum /* Attrib */ {
at_acc,
at_def,
at_str,
@@ -23,7 +23,7 @@ enum /* Lith_Attrib */ {
at_max
};

enum /* Lith_PData */ {
enum /* PData */ {
pdata_weapon,
pdata_upgrade,
pdata_riflemode,
@@ -38,7 +38,7 @@ enum /* Lith_PData */ {
pdata_attr,
};

enum /* Lith_SubweaponType */ {
enum /* SubweaponType */ {
_subw_gun,
_subw_dagger,
_subw_grenade,
@@ -48,7 +48,7 @@ enum /* Lith_SubweaponType */ {
_subw_max,
};

enum /* Lith_PClass */ {
enum /* PClass */ {
pcl_unknown,

/* Base Classes */


+ 1
- 1
source/include/p_hud.h View File

@@ -31,7 +31,7 @@ struct hud_wsl
};

void HUD_WeaponSlots_Impl(struct player *p, struct hud_wsl const *a);
void HUD_Score(struct player *p, cstr fmt, i96 scr, str font, str cr, i32 x, i32 xa);
void HUD_Score(struct player *p, cstr fmt, i96 scr, str font, cstr cr, i32 x, i32 xa);
void HUD_KeyInd(struct player *p, i32 x, i32 y, bool horz, k32 a);
script void HUD_Log(struct player *p, i32 cr, i32 x, i32 yy);
optargs(1) void HUD_DrawHealth(struct player *p, i32 health, i32 x, i32 y, char const *pfx, i32 cr);


+ 18
- 18
source/include/p_player.h View File

@@ -11,24 +11,24 @@
* ---------------------------------------------------------------------------|
*/

#if defined(LITH_X)
#if defined(PCL)
/* Shorthand and classes. For parsing and headers. */
LITH_X(pM, pcl_marine)
LITH_X(pC, pcl_cybermage)
LITH_X(pI, pcl_informant)
LITH_X(pW, pcl_wanderer)
LITH_X(pA, pcl_assassin)
LITH_X(pD, pcl_darklord)
LITH_X(pT, pcl_thoth)
LITH_X(gO, pcl_outcasts)
LITH_X(gM, pcl_missioners)
LITH_X(gI, pcl_intruders)
LITH_X(gA, pcl_any)
LITH_X(gH, pcl_human)
LITH_X(gN, pcl_nonhuman)
LITH_X(gR, pcl_robot)
#undef LITH_X
PCL(pM, pcl_marine)
PCL(pC, pcl_cybermage)
PCL(pI, pcl_informant)
PCL(pW, pcl_wanderer)
PCL(pA, pcl_assassin)
PCL(pD, pcl_darklord)
PCL(pT, pcl_thoth)
PCL(gO, pcl_outcasts)
PCL(gM, pcl_missioners)
PCL(gI, pcl_intruders)
PCL(gA, pcl_any)
PCL(gH, pcl_human)
PCL(gN, pcl_nonhuman)
PCL(gR, pcl_robot)
#undef PCL
#elif !defined(p_player_h)
#define p_player_h

@@ -94,7 +94,7 @@ enum {

enum
{
#define LITH_X(l, r) l = r,
#define PCL(l, r) l = r,
#include "p_player.h"
};



+ 9
- 9
source/include/w_data.h View File

@@ -12,7 +12,7 @@
*/
/* decompat-out pk7/lzscript/Constants/w_data.zsc */

enum /* Lith_WData */
enum /* WData */
{
wdata_bossspawned,
wdata_soulsfreed,
@@ -21,7 +21,7 @@ enum /* Lith_WData */
wdata_pclass,
};

enum /* Lith_Fun */
enum /* Fun */
{
lfun_ragnarok = 1 << 0,
lfun_bips = 1 << 1,
@@ -29,7 +29,7 @@ enum /* Lith_Fun */
lfun_division = 1 << 3,
};

enum /* Lith_CBIUpgradeM */
enum /* CBIUpgradeM */
{
cupg_weapninter,
cupg_hasupgr1,
@@ -40,7 +40,7 @@ enum /* Lith_CBIUpgradeM */
cupg_max
};

enum /* Lith_CBIUpgradeC */
enum /* CBIUpgradeC */
{
cupg_c_slot3spell,
cupg_c_slot4spell,
@@ -50,7 +50,7 @@ enum /* Lith_CBIUpgradeC */
cupg_c_rdistinter,
};

enum /* Lith_RandomSpawnNum */
enum /* RandomSpawnNum */
{
lrsn_garmor,
lrsn_barmor,
@@ -60,7 +60,7 @@ enum /* Lith_RandomSpawnNum */
lrsn_clipbx,
};

enum /* Lith_MsgType */
enum /* MsgType */
{
msg_ammo,
msg_huds,
@@ -68,7 +68,7 @@ enum /* Lith_MsgType */
msg_both
};

enum /* Lith_DamageType */
enum /* DamageType */
{
ldt_bullets,
ldt_energy,
@@ -82,7 +82,7 @@ enum /* Lith_DamageType */
ldt_none
};

enum /* Lith_ScriptNum */
enum /* ScriptNum */
{
lsc_getfontmetric = 17100,
lsc_metr_xadv,
@@ -99,7 +99,7 @@ enum /* Lith_ScriptNum */
lsc_monstertype,
};

enum /* Lith_BossType */
enum /* BossType */
{
boss_none,
boss_barons,


+ 1
- 1
source/include/w_monster.h View File

@@ -33,7 +33,7 @@ enum dmgtype {
};
/* decompat-end */

enum mtype /* Lith_MonsterType*/ {
enum mtype /* MonsterType */ {
mtype_unknown,
mtype_zombie,
mtype_zombiesg,


+ 1
- 1
source/p_bip.c View File

@@ -143,7 +143,7 @@ stkcall cstr P_BIP_CategoryToName(u32 category) {

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_BIPUnlock")
script_str ext("ACS") addr(OBJ "BIPUnlock")
void Sc_UnlockPage(void) {
with_player(LocalPlayer) {
bip_name_t tag; lstrcpy_str(tag, ServCallS(sm_GetBipName));


+ 1
- 1
source/p_cbi.c View File

@@ -147,7 +147,7 @@ void P_CBI_PMinit(struct player *p) {

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") type("net") addr("Lith_KeyOpenCBI")
script_str ext("ACS") type("net") addr(OBJ "KeyOpenCBI")
void Sc_OpenCBI(void) {
if(ACS_Timer() < 10) return;
with_player(LocalPlayer) P_GUI_Use(p);


+ 1
- 1
source/p_data.c View File

@@ -380,7 +380,7 @@ void P_Dat_PTickPst(struct player *p)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_KeyDown")
script_str ext("ACS") addr(OBJ "KeyDown")
void Sc_KeyDown(i32 pnum, i32 ch)
{
with_player(&players[pnum])


+ 3
- 3
source/p_hud.c View File

@@ -40,12 +40,12 @@ void HUD_WeaponSlots_Impl(struct player *p, struct hud_wsl const *a)
}
}

void HUD_Score(struct player *p, cstr fmt, i96 scrn, str font, str cr, i32 x, i32 xa)
void HUD_Score(struct player *p, cstr fmt, i96 scrn, str font, cstr cr, i32 x, i32 xa)
{
if(p->getCVarI(sc_hud_showscore)) {
str scr = StrParam(fmt, scoresep(scrn));

PrintTextFmt("\C%S%S", cr, scr);
PrintTextFmt("\C%s%S", cr, scr);
PrintTextX(font, 0, x,xa, 3,1, ptf_no_utf);

if(p->score > p->old.score) {
@@ -72,7 +72,7 @@ void HUD_Score(struct player *p, cstr fmt, i96 scrn, str font, str cr, i32 x, i3
}

if(p->getCVarI(sc_hud_showlvl)) {
PrintTextFmt("\C%SLv.%u", cr, p->attr.level);
PrintTextFmt("\C%sLv.%u", cr, p->attr.level);
if(p->attr.points) __nprintf(" (%u pts)", p->attr.points);
PrintTextX(font, 0, x,xa, 17,1, ptf_no_utf);
}


+ 5
- 5
source/p_items.c View File

@@ -436,7 +436,7 @@ void P_CBI_TabItems(struct gui_state *g, struct player *p)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_ItemCreate")
script_str ext("ACS") addr(OBJ "ItemCreate")
struct item *Sc_ItemCreate(u32 w, u32 h, u32 equip, u32 scr)
{
str name = GetMembS(0, sm_InvName);
@@ -456,7 +456,7 @@ struct item *Sc_ItemCreate(u32 w, u32 h, u32 equip, u32 scr)
return P_Item_New(&data);
}

script_str ext("ACS") addr("Lith_ItemAttach")
script_str ext("ACS") addr(OBJ "ItemAttach")
bool Sc_ItemAttach(struct item *item)
{
Dbg_Log(log_dev, "%s: attaching item %p", __func__, item);
@@ -466,7 +466,7 @@ bool Sc_ItemAttach(struct item *item)
return false;
}

script_str ext("ACS") addr("Lith_ItemDetach")
script_str ext("ACS") addr(OBJ "ItemDetach")
void Sc_ItemDetach(struct item *item)
{
Dbg_Log(log_dev, "%s: detaching item %p", __func__, item);
@@ -474,7 +474,7 @@ void Sc_ItemDetach(struct item *item)
if(item->Destroy) item->Destroy(item);
}

script_str ext("ACS") addr("Lith_ItemCanPlace")
script_str ext("ACS") addr(OBJ "ItemCanPlace")
bool Sc_ItemCanPlace(struct item *item)
{
with_player(LocalPlayer)
@@ -485,7 +485,7 @@ bool Sc_ItemCanPlace(struct item *item)
return false;
}

script_str ext("ACS") addr("Lith_ItemOnBody")
script_str ext("ACS") addr(OBJ "ItemOnBody")
bool Sc_ItemOnBody(struct item *item)
{
return item->container && item->container->type == _cont_body;


+ 1
- 1
source/p_log.c View File

@@ -198,7 +198,7 @@ script void HUD_Log(struct player *p, i32 cr, i32 x, i32 yy) {

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_LogS")
script_str ext("ACS") addr(OBJ "LogS")
void Sc_Log(i32 levl, i32 type) {
str name = ServCallS(sm_GetLogName);



+ 5
- 5
source/p_magic.c View File

@@ -17,7 +17,7 @@

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_Blade")
script_str ext("ACS") addr(OBJ "Blade")
void Sc_Blade(bool hit)
{
with_player(LocalPlayer) {
@@ -27,7 +27,7 @@ void Sc_Blade(bool hit)
}
}

script_str ext("ACS") addr("Lith_Rend")
script_str ext("ACS") addr(OBJ "Rend")
void Sc_Rend(bool hit, i32 set)
{
with_player(LocalPlayer) {
@@ -37,7 +37,7 @@ void Sc_Rend(bool hit, i32 set)
}
}

script_str ext("ACS") addr("Lith_Feuer")
script_str ext("ACS") addr(OBJ "Feuer")
void Sc_Feuer(bool left, bool fire)
{
with_player(LocalPlayer)
@@ -80,7 +80,7 @@ void Sc_Feuer(bool left, bool fire)
}
}

script_str ext("ACS") addr("Lith_Cercle")
script_str ext("ACS") addr(OBJ "Cercle")
void Sc_Cercle(void)
{
with_player(LocalPlayer)
@@ -163,7 +163,7 @@ void Sc_Cercle(void)
}
}

script_str ext("ACS") addr("Lith_MagicSelect")
script_str ext("ACS") addr(OBJ "MagicSelect")
void Sc_MagicSelect(i32 num)
{
with_player(LocalPlayer)


+ 1
- 1
source/p_obituary.c View File

@@ -16,7 +16,7 @@

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_Obituary")
script_str ext("ACS") addr(OBJ "Obituary")
void Sc_Obituary(void)
{
Str(ob_crush, s"(crush)");


+ 6
- 6
source/p_player.c View File

@@ -464,7 +464,7 @@ stkcall static void P_Aug_PTick(struct player *p) {

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_Markiplier")
script_str ext("ACS") addr(OBJ "Markiplier")
void Sc_MapMarker(i32 tid) {
enum {ticks = 35 * 2};

@@ -490,7 +490,7 @@ void Sc_MapMarker(i32 tid) {
}
}

script_str ext("ACS") addr("Lith_SetAdviceMarker")
script_str ext("ACS") addr(OBJ "SetAdviceMarker")
void Sc_SetAdviceMarker(i32 tid) {
str text;

@@ -535,7 +535,7 @@ void Sc_DrawPlayerIcon(i32 num, i32 x, i32 y) {
}
}

script_str type("net") ext("ACS") addr("Lith_KeyBuyAutoGroup")
script_str type("net") ext("ACS") addr(OBJ "KeyBuyAutoGroup")
void Sc_KeyBuyAutoGroup(i32 grp) {
Str(snd_bought, s"player/cbi/auto/buy");
Str(snd_invalid, s"player/cbi/auto/invalid");
@@ -573,7 +573,7 @@ void Sc_KeyBuyAutoGroup(i32 grp) {
}
}

script_str type("net") ext("ACS") addr("Lith_KeyToggleAutoGroup")
script_str type("net") ext("ACS") addr(OBJ "KeyToggleAutoGroup")
void Sc_KeyToggleAutoGroup(i32 grp) {
Str(snd, s"player/cbi/auto/toggle");

@@ -598,7 +598,7 @@ void Sc_KeyToggleAutoGroup(i32 grp) {
}
}

script_str type("net") ext("ACS") addr("Lith_KeyGlare")
script_str type("net") ext("ACS") addr(OBJ "KeyGlare")
void Sc_KeyGlare(void) {
with_player(LocalPlayer) {
Str(snd, s"player/glare");
@@ -617,7 +617,7 @@ void Sc_KeyGlare(void) {
}
}

script_str ext("ACS") addr("Lith_TimelineInconsistent")
script_str ext("ACS") addr(OBJ "TimelineInconsistent")
void Sc_TimelineInconsistent(void) {
for(;;) {
for_player() {


+ 8
- 8
source/p_powerup.c View File

@@ -19,7 +19,7 @@

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_DOGS")
script_str ext("ACS") addr(OBJ "DOGS")
void Sc_DOGS(void)
{
with_player(LocalPlayer)
@@ -46,7 +46,7 @@ void Sc_DOGS(void)
}
}

script_str ext("ACS") addr("Lith_SteggleEnergy")
script_str ext("ACS") addr(OBJ "SteggleEnergy")
void Sc_SteggleEnergy(void)
{
with_player(P_PtrFind(0, AAPTR_FRIENDPLAYER))
@@ -71,7 +71,7 @@ void Sc_SteggleEnergy(void)
}
}

script_str ext("ACS") addr("Lith_BarrierBullets")
script_str ext("ACS") addr(OBJ "BarrierBullets")
void Sc_BarrierBullets(void)
{
with_player(P_PtrFind(0, AAPTR_TARGET))
@@ -88,7 +88,7 @@ void Sc_BarrierBullets(void)
}
}

script_str ext("ACS") addr("Lith_GetSigil")
script_str ext("ACS") addr(OBJ "GetSigil")
void Sc_GetSigil(void)
{
with_player(LocalPlayer)
@@ -125,7 +125,7 @@ void Sc_GetSigil(void)
}
}

script_str ext("ACS") addr("Lith_GiveHealthBonus")
script_str ext("ACS") addr(OBJ "GiveHealthBonus")
void Sc_GiveHealthBonus(i32 amount)
{
with_player(LocalPlayer)
@@ -136,7 +136,7 @@ void Sc_GiveHealthBonus(i32 amount)
}
}

script_str ext("ACS") addr("Lith_GiveHealth")
script_str ext("ACS") addr(OBJ "GiveHealth")
void Sc_GiveHealth(i32 amount)
{
with_player(LocalPlayer)
@@ -148,14 +148,14 @@ void Sc_GiveHealth(i32 amount)
}
}

script_str ext("ACS") addr("Lith_CheckHealth")
script_str ext("ACS") addr(OBJ "CheckHealth")
bool Sc_CheckHealth(void)
{
with_player(LocalPlayer) return p->health < p->maxhealth;
return 0;
}

script_str ext("ACS") addr("Lith_Discount")
script_str ext("ACS") addr(OBJ "Discount")
void Sc_Discount(void)
{
with_player(LocalPlayer) p->discount = 0.9;


+ 9
- 9
source/p_weapons.c View File

@@ -209,7 +209,7 @@ void P_Wep_PTick(struct player *p)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_WeaponPickup")
script_str ext("ACS") addr(OBJ "WeaponPickup")
bool Sc_WeaponPickup(i32 name)
{
extern void P_Log_Weapon(struct player *p, struct weaponinfo const *info);
@@ -254,7 +254,7 @@ bool Sc_WeaponPickup(i32 name)
}
}

script_str ext("ACS") addr("Lith_CircleSpread")
script_str ext("ACS") addr(OBJ "CircleSpread")
k32 Sc_CircleSpread(k32 mdx, k32 mdy, bool getpitch)
{
static k32 A;
@@ -275,7 +275,7 @@ k32 Sc_CircleSpread(k32 mdx, k32 mdy, bool getpitch)
return P;
}

script_str ext("ACS") addr("Lith_ChargeFistDamage")
script_str ext("ACS") addr(OBJ "ChargeFistDamage")
i32 Sc_ChargeFistDamage(void)
{
i32 amount = InvNum(so_FistCharge);
@@ -283,7 +283,7 @@ i32 Sc_ChargeFistDamage(void)
return amount * ACS_Random(1, 3);
}

script_str ext("ACS") addr("Lith_AmmoRunOut")
script_str ext("ACS") addr(OBJ "AmmoRunOut")
k32 Sc_AmmoRunOut(bool ro, k32 mul)
{
with_player(LocalPlayer)
@@ -305,7 +305,7 @@ k32 Sc_AmmoRunOut(bool ro, k32 mul)
return 0;
}

script_str ext("ACS") addr("Lith_GetFinalizerMaxHealth")
script_str ext("ACS") addr(OBJ "GetFinalizerMaxHealth")
i32 Sc_GetFinalizerMaxHealth(void)
{
i32 sh = GetPropI(0, APROP_SpawnHealth);
@@ -316,7 +316,7 @@ i32 Sc_GetFinalizerMaxHealth(void)
return sh;
}

script_str ext("ACS") addr("Lith_SurgeOfDestiny")
script_str ext("ACS") addr(OBJ "SurgeOfDestiny")
void Sc_SurgeOfDestiny(void)
{
for(i32 i = 0; i < (35 * 17) / 2; i++) {
@@ -325,7 +325,7 @@ void Sc_SurgeOfDestiny(void)
}
}

script_str ext("ACS") addr("Lith_GetWRF")
script_str ext("ACS") addr(OBJ "GetWRF")
i32 Sc_GetWRF(void)
{
enum
@@ -358,7 +358,7 @@ i32 Sc_GetWRF(void)
return flags;
}

script_str ext("ACS") addr("Lith_PoisonFXTicker")
script_str ext("ACS") addr(OBJ "PoisonFXTicker")
void Sc_PoisonFXTicker(void)
{
for(i32 i = 0; i < 17; i++)
@@ -386,7 +386,7 @@ void Sc_PoisonFXTicker(void)
}
}

script_str ext("ACS") addr("Lith_RecoilUp")
script_str ext("ACS") addr(OBJ "RecoilUp")
void Sc_RecoilUp(k32 amount)
{
with_player(LocalPlayer) p->extrpitch += amount / 180.lk;


+ 2
- 2
source/u_flashlight.c View File

@@ -101,13 +101,13 @@ stkcall void Upgr_Flashlight_Render(struct player *p, struct upgrade *upgr) {

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_GetFlashlightIntensity")
script_str ext("ACS") addr(OBJ "GetFlashlightIntensity")
k32 Sc_GetFlashlightIntensity(void) {
with_player(LocalPlayer) {return UData.intensity;}
return 0.0;
}

script_str type("net") ext("ACS") addr("Lith_KeyLight")
script_str type("net") ext("ACS") addr(OBJ "KeyLight")
void Sc_KeyLight(void) {with_player(LocalPlayer) {UData.on = !UData.on;}}

/* EOF */

+ 1
- 1
source/u_headsupdisc.c View File

@@ -89,7 +89,7 @@ void Upgr_HeadsUpDisC_Render(struct player *p, struct upgrade *upgr)

HUD_Log(p, CR_RED, 0, -10);
HUD_KeyInd(p, 180, 21, true, 0.8);
HUD_Score(p, CrRed "%s\Cnscr", p->score, s_smallfnt, s"a", 160,0);
HUD_Score(p, CrRed "%s\Cnscr", p->score, s_smallfnt, "a", 160,0);

if(p->getCVarI(sc_hud_showweapons))
PrintSprite(sp_HUD_C_Bar, 320,2, 220,2);


+ 1
- 1
source/u_headsupdisd.c View File

@@ -91,7 +91,7 @@ void Upgr_HeadsUpDisD_Render(struct player *p, struct upgrade *upgr)

HUD_Log(p, CR_LIGHTBLUE, 0, -10);
HUD_KeyInd(p, 180, 21, true, 0.8);
HUD_Score(p, CrBlue "%s\Cnscr", p->score, s_smallfnt, s"a", 160,0);
HUD_Score(p, CrBlue "%s\Cnscr", p->score, s_smallfnt, "a", 160,0);

if(p->getCVarI(sc_hud_showweapons))
PrintSprite(sp_HUD_D_WepBack, 320,2, 219,2);


+ 1
- 1
source/u_headsupdisi.c View File

@@ -102,7 +102,7 @@ void Upgr_HeadsUpDisI_Render(struct player *p, struct upgrade *upgr)
UData.score.value = p->score;
lerplli(&UData.score);

HUD_Score(p, "%s \CnScore", UData.score.value_display, s_lmidfont, s"[Lith_Purple]", 2,1);
HUD_Score(p, "%s \CnScore", UData.score.value_display, s_lmidfont, CrPurple, 2,1);

/* Status */
HUDI_Ammo(p, upgr);


+ 1
- 1
source/u_headsupdism.c View File

@@ -123,7 +123,7 @@ void Upgr_HeadsUpDisM_Render(struct player *p, struct upgrade *upgr)
HUD_Log(p, CR_GREEN, 0, 0);

HUD_KeyInd(p, 320, 20, true, 0.8);
HUD_Score(p, "%s\Cnscr", p->score, s_smallfnt, s"j", 320,2);
HUD_Score(p, "%s\Cnscr", p->score, s_smallfnt, "j", 320,2);

if(p->getCVarI(sc_hud_showweapons))
PrintSprite(sp_HUD_Bar, 279,2, 238,2);


+ 1
- 1
source/u_homingrpg.c View File

@@ -52,7 +52,7 @@ void Upgr_HomingRPG_Update(struct player *p, struct upgrade *upgr)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_HomingMissile")
script_str ext("ACS") addr(OBJ "HomingMissile")
void Sc_HomingMissile(void)
{
struct player *p = P_PtrFind(0, AAPTR_TARGET);


+ 1
- 1
source/u_magic.c View File

@@ -184,7 +184,7 @@ void Upgr_Magic_Render(struct player *p, struct upgrade *upgr)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_SetMagicUI")
script_str ext("ACS") addr(OBJ "SetMagicUI")
void Sc_SetMagicUI(bool on)
{
with_player(LocalPlayer) SetMagicUI(p, on);


+ 1
- 1
source/u_punctcannon.c View File

@@ -25,7 +25,7 @@ void Upgr_PunctCannon_Deactivate(struct player *p, struct upgrade *upgr)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_PunctuatorFire")
script_str ext("ACS") addr(OBJ "PunctuatorFire")
void Sc_PunctuatorFire(void)
{
with_player(LocalPlayer)


+ 1
- 1
source/u_reactarmor.c View File

@@ -73,7 +73,7 @@ void Upgr_ReactArmor_Render(struct player *p, struct upgrade *upgr)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_RA_Give")
script_str ext("ACS") addr(OBJ "RA_Give")
void Sc_GiveRA(i32 num)
{
with_player(LocalPlayer)


+ 1
- 1
source/u_reflexwetw.c View File

@@ -94,7 +94,7 @@ void Upgr_ReflexWetw_Update(struct player *p, struct upgrade *upgr)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_DodgeView")
script_str ext("ACS") addr(OBJ "DodgeView")
void Sc_DodgeView(void)
{
with_player(LocalPlayer) DodgeView(p);


+ 2
- 2
source/u_riflemodes.c View File

@@ -47,7 +47,7 @@ void Upgr_RifleModes_Render(struct player *p, struct upgrade *upgr)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_SwitchRifleFiremode")
script_str ext("ACS") addr(OBJ "SwitchRifleFiremode")
void Sc_SwitchRifleFiremode(void)
{
with_player(LocalPlayer)
@@ -57,7 +57,7 @@ void Sc_SwitchRifleFiremode(void)
}
}

script_str ext("ACS") addr("Lith_ResetRifleMode")
script_str ext("ACS") addr(OBJ "ResetRifleMode")
void Sc_ResetRifleMode(void)
{
with_player(LocalPlayer)


+ 3
- 3
source/u_subweapons.c View File

@@ -81,7 +81,7 @@ stkcall void Upgr_Subweapons_Enter(struct player *p, struct ugprade *upgr) {

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_GetSubShots")
script_str ext("ACS") addr(OBJ "GetSubShots")
i32 Sc_GetSubShots(void) {
with_player(LocalPlayer) {
if(get_bit(p->upgrades[UPGR_Subweapons].flags, _ug_active)) {
@@ -92,7 +92,7 @@ i32 Sc_GetSubShots(void) {
return 0;
}

script_str ext("ACS") addr("Lith_TakeSubShot")
script_str ext("ACS") addr(OBJ "TakeSubShot")
void Sc_TakeSubShot(void) {
with_player(LocalPlayer) {
if(get_bit(p->upgrades[UPGR_Subweapons].flags, _ug_active)) {
@@ -101,7 +101,7 @@ void Sc_TakeSubShot(void) {
}
}

script_str ext("ACS") addr("Lith_GetSubType")
script_str ext("ACS") addr(OBJ "GetSubType")
i32 Sc_GetSubType(void) {
with_player(LocalPlayer) {
return UData.which;


+ 1
- 1
source/u_zoom.c View File

@@ -73,7 +73,7 @@ void Upgr_Zoom_Render(struct player *p, struct upgrade *upgr)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") type("net") addr("Lith_KeyZoom")
script_str ext("ACS") type("net") addr(OBJ "KeyZoom")
void Sc_KeyZoom(i32 amt)
{
if(ACS_Timer() < 10) return;


+ 7
- 7
source/w_boss.c View File

@@ -153,13 +153,13 @@ void SpawnBosses(i96 sum, bool force)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_PhantomSound")
script_str ext("ACS") addr(OBJ "PhantomSound")
void Sc_PhantomSound(void)
{
ACS_AmbientSound(ss_enemies_phantom_spawned, 127);
}

script_str ext("ACS") addr("Lith_PhantomTeleport")
script_str ext("ACS") addr(OBJ "PhantomTeleport")
void Sc_PhantomTeleport(void)
{
k32 ang = ACS_GetActorAngle(0);
@@ -172,7 +172,7 @@ void Sc_PhantomTeleport(void)
}
}

script_str ext("ACS") addr("Lith_PhantomDeath")
script_str ext("ACS") addr(OBJ "PhantomDeath")
void Sc_PhantomDeath(void)
{
ACS_StopSound(0, 7);
@@ -200,7 +200,7 @@ void Sc_PhantomDeath(void)
ACS_Delay(2);
}

Dbg_Log(log_boss, "Lith_PhantomDeath: %s phase %i defeated", boss->name, boss->phase);
Dbg_Log(log_boss, "%s: %s phase %i defeated", __func__, boss->name, boss->phase);

if(!ACS_GetCVar(sc_sv_nobossdrop))
SpawnBossReward();
@@ -216,7 +216,7 @@ void Sc_PhantomDeath(void)
bossspawned = false;
}

script_str ext("ACS") addr("Lith_SpawnBoss")
script_str ext("ACS") addr(OBJ "SpawnBoss")
void Sc_SpawnBoss(void)
{
if(!boss) return;
@@ -226,13 +226,13 @@ void Sc_SpawnBoss(void)

ServCallI(sm_SpawnBoss, StrParam(OBJ "Boss_%s", boss->name), boss->phase);

Dbg_Log(log_boss, "Lith_SpawnBoss: Boss %s phase %i spawned", boss->name, boss->phase);
Dbg_Log(log_boss, "%s: Boss %s phase %i spawned", __func__, boss->name, boss->phase);
Dbg_Note("boss: %s phase %i spawned\n", boss->name, boss->phase);

bossspawned = true;
}

script_str ext("ACS") addr("Lith_TriggerBoss") optargs(1)
script_str ext("ACS") addr(OBJ "TriggerBoss") optargs(1)
void Sc_TriggerBoss(i32 diff, i32 num, i32 phase)
{
switch(diff) {


+ 2
- 2
source/w_cbi.c View File

@@ -85,13 +85,13 @@ void CBI_InstallSpawned(void)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_CBIItemWasSpawned")
script_str ext("ACS") addr(OBJ "CBIItemWasSpawned")
void Sc_CBIItemWasSpawned(i32 num)
{
cbispawn[cbispawniter++] = num;
}

script_str ext("ACS") addr("Lith_PickupCBIItem")
script_str ext("ACS") addr(OBJ "PickupCBIItem")
void Sc_PickupCBIItem(i32 num)
{
with_player(LocalPlayer)


+ 1
- 1
source/w_cyberspace.c View File

@@ -18,7 +18,7 @@

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_CSLoadMap")
script_str ext("ACS") addr(OBJ "CSLoadMap")
void Sc_CSLoadMap(void)
{
FILE *fp = W_Open(sp_lfiles_Cyberspace, "r");


+ 4
- 4
source/w_misc.c View File

@@ -135,25 +135,25 @@ void Sc_AddAngle(i32 x, i32 y)
AddAngle(x, y);
}

script_str ext("ACS") addr("Lith_EmitScore")
script_str ext("ACS") addr(OBJ "EmitScore")
void Sc_EmitScore(i32 amount)
{
/* dummied out */
}

script_str ext("ACS") addr("Lith_EmitEXP")
script_str ext("ACS") addr(OBJ "EmitEXP")
void Sc_EmitEXP(i32 amount)
{
P_GiveAllEXP(amount);
}

script_str ext("ACS") addr("Lith_GiveScore")
script_str ext("ACS") addr(OBJ "GiveScore")
void Sc_GiveScore(i32 score)
{
P_GiveAllScore(score * (k64)ACS_RandomFixed(0.7, 1.2), false);
}

script_str ext("ACS") addr("Lith_BoughtItemPickup")
script_str ext("ACS") addr(OBJ "BoughtItemPickup")
void Sc_BoughtItemPickup(i32 id)
{
with_player(LocalPlayer) if(id)


+ 3
- 3
source/w_monster.c View File

@@ -352,13 +352,13 @@ i32 Sc_GetMonsterType()
else return mtype_unknown;
}

script_str ext("ACS") addr("Lith_GiveMonsterEXP")
script_str ext("ACS") addr(OBJ "GiveMonsterEXP")
void Sc_GiveMonsterEXP(i32 amt)
{
ifauto(dmon_t *, m, DmonSelf()) m->exp += amt;
}

script_str ext("ACS") addr("Lith_ResurrectMonster")
script_str ext("ACS") addr(OBJ "ResurrectMonster")
void Sc_ResurrectMonster(i32 amt)
{
ifauto(dmon_t *, m, DmonSelf()) m->ms->resurrect = true;
@@ -399,7 +399,7 @@ void Sc_MonsterInfo(void)
InvGive(so_MonsterInvalid, 1);
}

script_str ext("ACS") addr("Lith_MonsterFinalized")
script_str ext("ACS") addr(OBJ "MonsterFinalized")
void Sc_MonsterFinalized(void)
{
ifauto(dmon_t *, m, DmonSelf())


+ 1
- 1
source/w_spawn.c View File

@@ -102,7 +102,7 @@ static cstr RandomWeighted(struct witem const *l, i32 c)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_RandomSpawn")
script_str ext("ACS") addr(OBJ "RandomSpawn")
void Sc_RandomSpawn(i32 rsn)
{
cstr item;


+ 1
- 1
source/w_time.c View File

@@ -73,7 +73,7 @@ void UnfreezeTime(bool players_ok) {

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_Timer")
script_str ext("ACS") addr(OBJ "Timer")
i32 Sc_Timer(void) {
return ACS_Timer();
}


+ 12
- 12
source/w_world.c View File

@@ -110,20 +110,20 @@ static void UpdateGame(void)
if(ACS_GetCVarFixed(sc_version) < n) \
__with(ACS_SetCVarFixed(sc_version, n);)

Update(Lith_v1_5_1)
Update(v1_5_1)
ACS_SetCVarFixed(sc_sv_scoremul, 1.25); /* 2.0 => 1.25 */

Update(Lith_v1_5_2)
Update(v1_5_2)
ACS_SetCVar(sc_sv_difficulty, 10); /* 1 => 10 */

Update(Lith_v1_6_0) {
Update(v1_6_0) {
for_player() {
p->setCVarK(sc_player_footstepvol, 0.2); /* 1.0 => 0.2 */
p->setCVarI(sc_player_ammolog, true); /* false => true */
}
}

Update(Lith_v1_6_1) {
Update(v1_6_1) {
for_player() {
p->setCVarK(sc_weapons_zoomfactor, 1.5); /* 3.0 => 1.5 */
}
@@ -132,7 +132,7 @@ static void UpdateGame(void)
/* unfortunate, but we forgot to add this for 1.6.3. so, we'll fix it in
* version 1.7 instead.
*/
Update(Lith_v1_7_0) {
Update(v1_7_0) {
for_player() {
if(p->getCVarI(sc_xhair_style) >= 10) {
p->setCVarI(sc_xhair_style, 0);
@@ -189,9 +189,9 @@ static void MInitPst(void)

/* Check for if rain should be used.
* - If there are more than 1 players, never use rain.
* - If `user_Lith_NoRain' is set on LithMapLine, never use rain.
* - If `NoRain' is set on LithMapLine, never use rain.
* - If the player has rain enabled, use it if not for those preconditions.
* - If `user_Lith_UseRain' is set on LithMapLine, use it if not for that.
* - If `UseRain' is set on LithMapLine, use it if not for that.
*/
bool multi_player = ACS_PlayerCount() > 1;
bool never_rain = ACS_GetLineUDMFInt(LithMapLine, sm_MapNoRain);
@@ -295,7 +295,7 @@ static void HInit(void)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_PreInit")
script_str ext("ACS") addr(OBJ "PreInit")
void Sc_PreInit(void)
{
GetDebugInfo();
@@ -428,13 +428,13 @@ begin:
}
}

script_str ext("ACS") addr("Lith_InHell") i32 Sc_InHell(void) {return InHell;}
script_str ext("ACS") addr(OBJ "InHell") i32 Sc_InHell(void) {return InHell;}

script_str ext("ACS") addr("Lith_SkyMap") i32 Sc_SkyMap(void) {
script_str ext("ACS") addr(OBJ "SkyMap") i32 Sc_SkyMap(void) {
return ACS_GetCVar(sc_sv_sky) && !islithmap;
}

script_str ext("ACS") addr("Lith_WorldReopen")
script_str ext("ACS") addr(OBJ "WorldReopen")
void Sc_WorldReopen(void)
{
reopen = true;
@@ -457,7 +457,7 @@ static void Sc_WorldUnload(void)
}
}

script_str ext("ACS") addr("Lith_Finale")
script_str ext("ACS") addr(OBJ "Finale")
void Sc_Finale(void)
{
Str(normal, s"Normal");


+ 1
- 1
tools/decompat.rb View File

@@ -31,7 +31,7 @@ for filename in ARGV
outfiles.push $~[1]
else
if ln =~ /enum\s+\w*\s*\/\*\s*([^\s]+)\s*\*\/( {)?/
ln = "enum #{$~[1]}#{$~[2]}"
ln = "enum Lith_#{$~[1]}#{$~[2]}"
end
out.push ln unless cut
end


+ 1
- 1
tools/upgc.rb View File

@@ -129,7 +129,7 @@ common_main do
#{generated_header "upgc"}
/* decompat-out pk7/lzscript/Constants/u_names.zsc */

enum /* Lith_UpgradeName */ {
enum /* UpgradeName */ {
#{
res = String.new
upgrades.each_key do |una| res.concat " UPGR_#{una},\n" end


+ 3
- 3
tools/wepc.rb View File

@@ -81,7 +81,7 @@ common_main do
*/
#{generated_header "wepc"}

enum /* Lith_WeaponNum */ {
enum /* WeaponNum */ {
weapon_min = 1,
weapon_unknown = 0,

@@ -93,7 +93,7 @@ res
weapon_max
};

enum /* Lith_WeaponName */ {
enum /* WeaponName */ {
wepnam_fist,
wepnam_chainsaw,
wepnam_pistol,
@@ -107,7 +107,7 @@ enum /* Lith_WeaponName */ {
wepnam_max,
};

enum /* Lith_RifleMode */ {
enum /* RifleMode */ {
rifle_firemode_auto,
rifle_firemode_grenade,
rifle_firemode_burst,


Loading…
Cancel
Save