Skip to content

Making Furyband build on Linux #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mariari wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Making Furyband build on Linux #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c9d762
Update code to map to RF8 so the make file compiles
mariari Jan 13, 2022
3d2eb53
Changed keyword restrict to restrictions
mariari Jan 13, 2022
8823d82
Added PKG files so the game can build on Linux
mariari Jan 13, 2022
e7939bc
Update monster.pkg to conform to defines.h and use RF8 and not RF3
mariari Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Furyband/birth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ static void gen_random_quests(int n)
dungeon_type = old_type;
}

int dump_classes(s16b *classes, int sel, u32b *restrict)
int dump_classes(s16b *classes, int sel, u32b *restrictions)
{
int n = 0;

Expand Down Expand Up @@ -1377,15 +1377,15 @@ int dump_classes(s16b *classes, int sel, u32b *restrict)
cp_ptr->flags1 & PR1_EXPERIMENTAL ? "\nEXPERIMENTAL" : "");
print_desc(desc);

if (!(restrict[classes[n] / 32] & BIT(classes[n])) ||
cp_ptr->flags1 & PR1_EXPERIMENTAL)
if (!((restrictions[classes[n] / 32]) & BIT(classes[n])) ||
cp_ptr->flags1 & PR1_EXPERIMENTAL)
c_put_str(TERM_BLUE, buf, 18 + (n / 4), 1 + 20 * (n % 4));
else
c_put_str(TERM_L_BLUE, buf, 18 + (n / 4), 1 + 20 * (n % 4));
}
else
{
if (!(restrict[classes[n] / 32] & BIT(classes[n])) ||
if (!(restrictions[classes[n] / 32] & BIT(classes[n])) ||
cp_ptr->flags1 & PR1_EXPERIMENTAL)
c_put_str(TERM_SLATE, buf, 18 + (n / 4), 1 + 20 * (n % 4));
else
Expand Down Expand Up @@ -1650,7 +1650,7 @@ static bool player_birth_aux_ask()

int racem[100], max_racem = 0;

u32b restrict[2];
u32b restrictions[2];

cptr str;

Expand Down Expand Up @@ -2022,7 +2022,7 @@ static bool player_birth_aux_ask()
int z;

for (z = 0; z < 2; z++)
restrict[z] = (rp_ptr->choice[z] | rmp_ptr->pclass[z]) & (~rmp_ptr->mclass[z]);
restrictions[z] = (rp_ptr->choice[z] | rmp_ptr->pclass[z]) & (~rmp_ptr->mclass[z]);

if (max_mc_idx > 1)
{
Expand Down Expand Up @@ -2075,7 +2075,7 @@ static bool player_birth_aux_ask()
{
/* Dump classes */
sel = 0;
n = dump_classes(class_types, sel, restrict);
n = dump_classes(class_types, sel, restrictions);

/* Get a class */
while (1)
Expand Down Expand Up @@ -2103,27 +2103,27 @@ static bool player_birth_aux_ask()
{
sel += 4;
if (sel >= n) sel %= 4;
dump_classes(class_types, sel, restrict);
dump_classes(class_types, sel, restrictions);
}
else if (c == '8')
{
sel -= 4;
if (sel < 0) sel = n - 1 -( ( -sel) % 4);
/* C's modulus operator does not have defined
results for negative first values. Damn. */
dump_classes(class_types, sel, restrict);
dump_classes(class_types, sel, restrictions);
}
else if (c == '6')
{
sel++;
if (sel >= n) sel = 0;
dump_classes(class_types, sel, restrict);
dump_classes(class_types, sel, restrictions);
}
else if (c == '4')
{
sel--;
if (sel < 0) sel = n - 1;
dump_classes(class_types, sel, restrict);
dump_classes(class_types, sel, restrictions);
}
else if (c == '\r')
{
Expand All @@ -2135,8 +2135,8 @@ static bool player_birth_aux_ask()
}

/* Set class */
#ifdef RESTRICT_COMBINATIONS
if (!(restrict & BIT(k)))
#ifdef RESTRICTIONS_COMBINATIONS
if (!(restrictions & BIT(k)))
{
noscore |= 0x0020;
message_add(MESSAGE_MSG, " ", TERM_VIOLET);
Expand Down
8 changes: 4 additions & 4 deletions Furyband/w_mnster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
** Lua binding: monster
** Generated automatically by tolua 4.0a - angband on 08/01/07 21:25:27.
** Generated automatically by tolua 4.0a - angband on Wed Jan 12 22:46:57 2022.
*/

#include "lua/tolua.h"
Expand Down Expand Up @@ -2960,8 +2960,8 @@ void tolua_monster_close (lua_State* tolua_S)
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF2_ATTR_ANY");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF2_POWERFUL");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF2_ELDRITCH_HORROR");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF_AURA_FIRE");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF_AURA_ELEC");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF8_AURA_FIRE");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF8_AURA_ELEC");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF2_OPEN_DOOR");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF2_BASH_DOOR");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF2_PASS_WALL");
Expand All @@ -2988,7 +2988,7 @@ void tolua_monster_close (lua_State* tolua_S)
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF3_ANIMAL");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF3_THUNDERLORD");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF3_GOOD");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF_AURA_COLD");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF8_AURA_COLD");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF3_NONLIVING");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF3_HURT_LITE");
lua_pushnil(tolua_S); lua_setglobal(tolua_S,"RF3_HURT_ROCK");
Expand Down
Loading