Fixed crafting Shield spell resistance

GrognardsFromHell · Sep 6, 2016 · 0ff6a31 · 0ff6a31
1 parent 9a98c44
commit 0ff6a31
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/TemplePlus/fonts/fonts_layout.cpp b/TemplePlus/fonts/fonts_layout.cpp
@@ -314,7 +314,7 @@ int TextLayouter::GetGlyphIdx(char ch, const char* text) {
 			case 0x97:
 				return GetGlyphIdx('-', text);
 			default:
-				return GetGlyphIdx(' ', text); // speak english or die!!!
+				return GetGlyphIdx('-', text); // speak english or die!!!
 			}
 		}
 

diff --git a/TemplePlus/gamesystems/objects/gameobject.h b/TemplePlus/gamesystems/objects/gameobject.h
@@ -216,6 +216,10 @@ struct GameObjectBody {
 	void SetLocation(locXY location);
 
 	Dispatcher* GetDispatcher() const {
+		//if (type == obj_t_portal){
+		//	//return nullptr; //should be nullptr anyway
+		//	int dummy = 1;
+		//}
 		uint32_t dispatcher = GetInt32(obj_f_dispatcher);
 		if (dispatcher == -1 || dispatcher == 0) {
 			return nullptr;

diff --git a/tpdata/tprules/craft_maa_specs.tab b/tpdata/tprules/craft_maa_specs.tab
@@ -57,7 +57,7 @@
 407	Shield Light Fortification	IESF_SHIELD	1	0		C3		
 408	Shield Arrow Deflection	IESF_SHIELD	1	0		C3		
 409	Shield Animated	IESF_SHIELD	1	0		C3		
-410	Shield Spell Resistance	IESF_ENABLED IESF_SHIELD IESF_INCREMENTAL	2	13		C15	'spell resistance'	
-411	Shield Spell Resistance	IESF_ENABLED IESF_SHIELD IESF_INCREMENTAL	3	15		C15	'spell resistance'		410
-412	Shield Spell Resistance	IESF_ENABLED IESF_SHIELD IESF_INCREMENTAL	4	17		C15	'spell resistance'		411
-413	Shield Spell Resistance	IESF_ENABLED IESF_SHIELD IESF_INCREMENTAL	5	19		C15	'spell resistance'		412
+410	Armor Spell Resistance	IESF_ENABLED IESF_SHIELD IESF_INCREMENTAL	2	13		C15	'spell resistance'	
+411	Armor Spell Resistance	IESF_ENABLED IESF_SHIELD IESF_INCREMENTAL	3	15		C15	'spell resistance'		410
+412	Armor Spell Resistance	IESF_ENABLED IESF_SHIELD IESF_INCREMENTAL	4	17		C15	'spell resistance'		411
+413	Armor Spell Resistance	IESF_ENABLED IESF_SHIELD IESF_INCREMENTAL	5	19		C15	'spell resistance'		412