1.1 --- a/core/smn_entities.cpp	Mon Jul 26 19:26:32 2010 -0400
     1.2 +++ b/core/smn_entities.cpp	Tue Jul 27 17:32:32 2010 -0500
     1.3 @@ -2,7 +2,7 @@
     1.4   * vim: set ts=4 :
     1.5   * =============================================================================
     1.6   * SourceMod
     1.7 - * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
     1.8 + * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
     1.9   * =============================================================================
    1.10   *
    1.11   * This program is free software; you can redistribute it and/or modify it under
    1.12 @@ -860,7 +860,7 @@
    1.13  		}
    1.14  	}
    1.15  
    1.16 -	return td->fieldOffset[TD_OFFSET_NORMAL];
    1.17 +	return GetTypeDescOffs(td);
    1.18  }
    1.19  
    1.20  static cell_t GetEntDataString(IPluginContext *pContext, const cell_t *params)
    1.21 @@ -1004,7 +1004,7 @@
    1.22  					td->fieldType);
    1.23  			}
    1.24  
    1.25 -			offset = td->fieldOffset[TD_OFFSET_NORMAL];
    1.26 +			offset = GetTypeDescOffs(td);
    1.27  			break;
    1.28  		}
    1.29  	case Prop_Send:
    1.30 @@ -1093,7 +1093,7 @@
    1.31  					td->fieldType);
    1.32  			}
    1.33  
    1.34 -			offset = td->fieldOffset[TD_OFFSET_NORMAL];
    1.35 +			offset = GetTypeDescOffs(td);
    1.36  			break;
    1.37  		}
    1.38  	case Prop_Send:
    1.39 @@ -1184,7 +1184,7 @@
    1.40  					FIELD_TIME);
    1.41  			}
    1.42  
    1.43 -			offset = td->fieldOffset[TD_OFFSET_NORMAL];
    1.44 +			offset = GetTypeDescOffs(td);
    1.45  			break;
    1.46  		}
    1.47  	case Prop_Send:
    1.48 @@ -1253,7 +1253,7 @@
    1.49  					FIELD_TIME);
    1.50  			}
    1.51  
    1.52 -			offset = td->fieldOffset[TD_OFFSET_NORMAL];
    1.53 +			offset = GetTypeDescOffs(td);
    1.54  			break;
    1.55  		}
    1.56  	case Prop_Send:
    1.57 @@ -1325,7 +1325,7 @@
    1.58  					FIELD_EHANDLE);
    1.59  			}
    1.60  
    1.61 -			offset = td->fieldOffset[TD_OFFSET_NORMAL];
    1.62 +			offset = GetTypeDescOffs(td);
    1.63  			break;
    1.64  		}
    1.65  	case Prop_Send:
    1.66 @@ -1393,7 +1393,7 @@
    1.67  					FIELD_EHANDLE);
    1.68  			}
    1.69  
    1.70 -			offset = td->fieldOffset[TD_OFFSET_NORMAL];
    1.71 +			offset = GetTypeDescOffs(td);
    1.72  			break;
    1.73  		}
    1.74  	case Prop_Send:
    1.75 @@ -1484,7 +1484,7 @@
    1.76  					FIELD_POSITION_VECTOR);
    1.77  			}
    1.78  
    1.79 -			offset = td->fieldOffset[TD_OFFSET_NORMAL];
    1.80 +			offset = GetTypeDescOffs(td);
    1.81  			break;
    1.82  		}
    1.83  	case Prop_Send:
    1.84 @@ -1560,7 +1560,7 @@
    1.85  					FIELD_POSITION_VECTOR);
    1.86  			}
    1.87  
    1.88 -			offset = td->fieldOffset[TD_OFFSET_NORMAL];
    1.89 +			offset = GetTypeDescOffs(td);
    1.90  			break;
    1.91  		}
    1.92  	case Prop_Send:
    1.93 @@ -1647,7 +1647,7 @@
    1.94  
    1.95  			bIsStringIndex = (td->fieldType != FIELD_CHARACTER);
    1.96  
    1.97 -			offset = td->fieldOffset[TD_OFFSET_NORMAL];
    1.98 +			offset = GetTypeDescOffs(td);
    1.99  			break;
   1.100  		}
   1.101  	case Prop_Send:
   1.102 @@ -1726,7 +1726,7 @@
   1.103  			{
   1.104  				return pContext->ThrowNativeError("Property \"%s\" is not a valid string", prop);
   1.105  			}
   1.106 -			offset = td->fieldOffset[TD_OFFSET_NORMAL];
   1.107 +			offset = GetTypeDescOffs(td);
   1.108  			maxlen = td->fieldSize;
   1.109  			break;
   1.110  		}