Add logic to show if weapon is in weapons

main
Jerry Aldrich 11 years ago
parent 9fc3115720
commit bc71876c21
  1. 16
      drawWindows.c
  2. 2
      structs.h

@ -76,7 +76,9 @@ void updateInfoWin(){
mvwaddch(infoWin, 2, 26, ACS_VLINE); mvwaddch(infoWin, 2, 26, ACS_VLINE);
mvwaddch(infoWin, 3, 26, ACS_LLCORNER); mvwaddch(infoWin, 3, 26, ACS_LLCORNER);
mvwaddch(infoWin, 1, 27, ACS_HLINE); mvwaddch(infoWin, 1, 27, ACS_HLINE);
mvwprintw(infoWin, 2, 27, "1"); if(!strcmp(allEntities[0].weapons[1].type,"Pistol")){
mvwprintw(infoWin, 2, 27, "1");
}
mvwaddch(infoWin, 3, 27, ACS_HLINE); mvwaddch(infoWin, 3, 27, ACS_HLINE);
mvwaddch(infoWin, 1, 28, ACS_URCORNER); mvwaddch(infoWin, 1, 28, ACS_URCORNER);
mvwaddch(infoWin, 2, 28, ACS_VLINE); mvwaddch(infoWin, 2, 28, ACS_VLINE);
@ -86,7 +88,9 @@ void updateInfoWin(){
mvwaddch(infoWin, 2, 31, ACS_VLINE); mvwaddch(infoWin, 2, 31, ACS_VLINE);
mvwaddch(infoWin, 3, 31, ACS_LLCORNER); mvwaddch(infoWin, 3, 31, ACS_LLCORNER);
mvwaddch(infoWin, 1, 32, ACS_HLINE); mvwaddch(infoWin, 1, 32, ACS_HLINE);
mvwprintw(infoWin, 2, 32, "2"); if(allEntities[0].weapons[2].type && !strcmp(allEntities[0].weapons[2].type,"Shotgun")){
mvwprintw(infoWin, 2, 32, "2");
}
mvwaddch(infoWin, 3, 32, ACS_HLINE); mvwaddch(infoWin, 3, 32, ACS_HLINE);
mvwaddch(infoWin, 1, 33, ACS_URCORNER); mvwaddch(infoWin, 1, 33, ACS_URCORNER);
mvwaddch(infoWin, 2, 33, ACS_VLINE); mvwaddch(infoWin, 2, 33, ACS_VLINE);
@ -96,7 +100,9 @@ void updateInfoWin(){
mvwaddch(infoWin, 2, 36, ACS_VLINE); mvwaddch(infoWin, 2, 36, ACS_VLINE);
mvwaddch(infoWin, 3, 36, ACS_LLCORNER); mvwaddch(infoWin, 3, 36, ACS_LLCORNER);
mvwaddch(infoWin, 1, 37, ACS_HLINE); mvwaddch(infoWin, 1, 37, ACS_HLINE);
mvwprintw(infoWin, 2, 37, "3"); if(allEntities[0].weapons[3].type && !strcmp(allEntities[0].weapons[3].type,"Rifle")){
mvwprintw(infoWin, 2, 37, "3");
}
mvwaddch(infoWin, 3, 37, ACS_HLINE); mvwaddch(infoWin, 3, 37, ACS_HLINE);
mvwaddch(infoWin, 1, 38, ACS_URCORNER); mvwaddch(infoWin, 1, 38, ACS_URCORNER);
mvwaddch(infoWin, 2, 38, ACS_VLINE); mvwaddch(infoWin, 2, 38, ACS_VLINE);
@ -106,7 +112,9 @@ void updateInfoWin(){
mvwaddch(infoWin, 2, 41, ACS_VLINE); mvwaddch(infoWin, 2, 41, ACS_VLINE);
mvwaddch(infoWin, 3, 41, ACS_LLCORNER); mvwaddch(infoWin, 3, 41, ACS_LLCORNER);
mvwaddch(infoWin, 1, 42, ACS_HLINE); mvwaddch(infoWin, 1, 42, ACS_HLINE);
mvwprintw(infoWin, 2, 42, "4"); if(allEntities[0].weapons[4].type && !strcmp(allEntities[0].weapons[4].type,"Laser")){
mvwprintw(infoWin, 2, 42, "4");
}
mvwaddch(infoWin, 3, 42, ACS_HLINE); mvwaddch(infoWin, 3, 42, ACS_HLINE);
mvwaddch(infoWin, 1, 43, ACS_URCORNER); mvwaddch(infoWin, 1, 43, ACS_URCORNER);
mvwaddch(infoWin, 2, 43, ACS_VLINE); mvwaddch(infoWin, 2, 43, ACS_VLINE);

@ -19,7 +19,7 @@ struct Entity {
char symbol; char symbol;
int prevYpos, prevXpos; int prevYpos, prevXpos;
int curYpos, curXpos; int curYpos, curXpos;
struct Weapon weapons[9]; struct Weapon weapons[5];
int curWeapon; int curWeapon;
int isAlive; int isAlive;
int hitCount; int hitCount;

Loading…
Cancel
Save