forked from NovaRain/Fallout2_Unofficial_Patch
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
give containers a separate header so that they have proper mstr #61
- Loading branch information
1 parent
385a9ba
commit 69caedb
Showing
15 changed files
with
40 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1444,4 +1444,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/************************************************************************************** | ||
Should the trap go off for any reason by critter influence, then this procedure will | ||
be called to deal damage to the critter, display a message stating how much damage | ||
was taken, and remove the trap. | ||
**************************************************************************************/ | ||
|
||
procedure Damage_Critter begin | ||
variable Trap_Damage; | ||
|
||
Trap_Damage:=random(MIN_DAMAGE,MAX_DAMAGE); | ||
|
||
if (source_obj == dude_obj) then begin | ||
critter_dmg(dude_obj,Trap_Damage,(DMG_explosion BWOR DMG_BYPASS_ARMOR)); | ||
/* display_msg("You set off the trap and were hit for "+Trap_Damage+" points of damage.); */ | ||
display_msg(mstr(166)+Trap_Damage+mstr(167)); | ||
end | ||
|
||
else begin | ||
critter_dmg(source_obj,Trap_Damage,(DMG_explosion BWOR DMG_BYPASS_ARMOR)); | ||
/* display_msg(Critter_Name+" set off the trap was hit for "+Trap_Damage+" points of damage"); */ | ||
display_msg(obj_name(source_obj)+mstr(168)+Trap_Damage+mstr(169)); | ||
end | ||
|
||
/* The trap is now disarmed and should never go off again. */ | ||
set_local_var(LVAR_Trapped, STATE_INACTIVE); | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1466,4 +1466,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1434,4 +1434,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1426,4 +1426,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1418,4 +1418,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1380,4 +1380,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1292,4 +1292,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1294,4 +1294,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1282,4 +1282,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1424,4 +1424,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1424,4 +1424,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1426,4 +1426,4 @@ end | |
|
||
|
||
|
||
#include "../headers/doors2.h" | ||
#include "../headers/containers.h" |