[Planeshift-cvs] CVS: planeshift/src/client modehandler.cpp,1.112,1.113

[Andy D. <kha...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22543/src/client

Modified Files:
	modehandler.cpp 
Log Message:
Extended the possibility of effects triggered on combat.

Index: modehandler.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/modehandler.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** modehandler.cpp	25 Mar 2005 17:34:48 -0000	1.112
--- modehandler.cpp	25 Mar 2005 17:59:24 -0000	1.113
***************
*** 1135,1139 ****
                      if(!(settings.meFilters & COMBAT_SUCCEEDED))
                          break;
!                     psSystemMessage ev(0,MSG_COMBAT_YOURHIT,"%s hits you on the %s for %1.2f damage!",  attacker->GetName(), locationName.GetData(),event.damage );
                      msghandler->Publish(ev.msg);
                  }
--- 1135,1139 ----
                      if(!(settings.meFilters & COMBAT_SUCCEEDED))
                          break;
!                     psSystemMessage ev(0,MSG_COMBAT_HITYOU,"%s hits you on the %s for %1.2f damage!",  attacker->GetName(), locationName.GetData(),event.damage );
                      msghandler->Publish(ev.msg);
                  }
***************
*** 1143,1147 ****
                      if(!(settings.meFilters & COMBAT_FAILED))
                          break;
!                     psSystemMessage ev(0,MSG_COMBAT_YOURHIT,"%s hits you on the %s but fails to do any damage!",  attacker->GetName(), locationName.GetData());
                      msghandler->Publish(ev.msg);
                  }
--- 1143,1147 ----
                      if(!(settings.meFilters & COMBAT_FAILED))
                          break;
!                     psSystemMessage ev(0,MSG_COMBAT_HITYOU,"%s hits you on the %s but fails to do any damage!",  attacker->GetName(), locationName.GetData());
                      msghandler->Publish(ev.msg);
                  }
***************
*** 1201,1205 ****
                      if(!(settings.vicinityFilters & COMBAT_SUCCEEDED))
                          break;
!                     psSystemMessage ev(0,MSG_COMBAT_YOURHIT,"%s hits %s for %1.2f damage!", attacker->GetName(), target->GetName(), event.damage );
                      msghandler->Publish(ev.msg);
                  }
--- 1201,1205 ----
                      if(!(settings.vicinityFilters & COMBAT_SUCCEEDED))
                          break;
!                     psSystemMessage ev(0,MSG_COMBAT_HITOTHER,"%s hits %s for %1.2f damage!", attacker->GetName(), target->GetName(), event.damage );
                      msghandler->Publish(ev.msg);
                  }
***************
*** 1209,1213 ****
                      if(!(settings.vicinityFilters & COMBAT_FAILED))
                          break;
!                     psSystemMessage ev(0,MSG_COMBAT_YOURHIT,"%s hits %s, but fails to do any damage!", attacker->GetName(), target->GetName());
                      msghandler->Publish(ev.msg);
                  }
--- 1209,1213 ----
                      if(!(settings.vicinityFilters & COMBAT_FAILED))
                          break;
!                     psSystemMessage ev(0,MSG_COMBAT_HITOTHER,"%s hits %s, but fails to do any damage!", attacker->GetName(), target->GetName());
                      msghandler->Publish(ev.msg);
                  }