Skip to content

Commit

Permalink
re-structured tree to be unzipped in sauer folder (for windows) and a…
Browse files Browse the repository at this point in the history
…dded some files that are needed. Also tidied up again weapon.cpp

added autoexec.cfg, some sounds to choose from, friendlist.cfg, the
sounds.cfg that is used in this mod, sauerbraten_aMod.bat to start the
mod, sauerbraten_aMod.cbp (changed compiled executable name to
sauerbraten_aMod)
  • Loading branch information
thalieht committed Jan 29, 2014
1 parent 1aeb87c commit 4c1d0ac
Show file tree
Hide file tree
Showing 360 changed files with 2,792 additions and 116 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
31 changes: 29 additions & 2 deletions fpsgame/client.cpp → Source_aMod/fpsgame/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,33 @@ namespace game
}

extern int deathscore;
VARP(allchatcolorchoice, 0, 0, 16);
VARP(teamchatcolorchoice, 0, 1, 16);

char chatcolors(char textcolorchoice)
{
switch(textcolorchoice)
{
case 0: return '0'; break;
case 1: return '1'; break;
case 2: return '2'; break;
case 3: return '3'; break;
case 4: return '4'; break;
case 5: return '5'; break;
case 6: return '6'; break;
case 7: return '7'; break;
case 8: return '8'; break;
case 9: return '9'; break;
case 10: return 'b'; break;
case 11: return 'g'; break;
case 12: return 'h'; break;
case 13: return 'm'; break;
case 14: return 'o'; break;
case 15: return 'p'; break;
case 16: return 'y'; break;
default: return '0'; break;
}
}

void parsemessages(int cn, fpsent *d, ucharbuf &p)
{
Expand Down Expand Up @@ -1248,7 +1275,7 @@ namespace game
if(isignored(d->clientnum)) break;
if(d->state!=CS_DEAD && d->state!=CS_SPECTATOR)
particle_textcopy(d->abovehead(), text, PART_TEXT, 2000, 0x32FF64, 4.0f, -8);
conoutf(CON_CHAT, "%s:\f0 %s", colorname(d), text);
conoutf(CON_CHAT, "%s:\f%c %s", colorname(d), chatcolors(allchatcolorchoice), text);

if(chatsounds) isfriend(d->name) > 0 ? playsound(S_FRIENDSCHAT) : playsound(S_ALLCHAT);
break;
Expand All @@ -1263,7 +1290,7 @@ namespace game
if(!t || isignored(t->clientnum)) break;
if(t->state!=CS_DEAD && t->state!=CS_SPECTATOR)
particle_textcopy(t->abovehead(), text, PART_TEXT, 2000, 0x6496FF, 4.0f, -8);
conoutf(CON_TEAMCHAT, "%s:\f1 %s", colorname(t), text);
conoutf(CON_TEAMCHAT, "%s:\f%c %s", colorname(t), chatcolors(teamchatcolorchoice), text);

if(chatsounds) isfriend(t->name) > 0 ? playsound(S_FRIENDSCHAT) : playsound(S_ALLCHAT);
break;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
201 changes: 87 additions & 114 deletions fpsgame/weapon.cpp → Source_aMod/fpsgame/weapon.cpp

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file added Source_aMod/vcpp/.objs/client32/shared/cube.h.gch
Binary file not shown.
Binary file added Source_aMod/vcpp/.objs/client32/vcpp/mingw.res
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Source_aMod/vcpp/.objs/client64/shared/cube.h.gch
Binary file not shown.
Binary file added Source_aMod/vcpp/.objs/client64/vcpp/mingw.res
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 4c1d0ac

Please sign in to comment.