1.1 --- a/core/smn_console.cpp Sat Mar 03 09:46:36 2007 +0000
1.2 +++ b/core/smn_console.cpp Sun Mar 04 04:05:03 2007 +0000
1.3 @@ -62,15 +62,15 @@
1.4 {
1.5 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.6 HandleError err;
1.7 - ConVar *cvar;
1.8 + ConVar *pConVar;
1.9
1.10 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.11 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.12 != HandleError_None)
1.13 {
1.14 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.15 }
1.16
1.17 - g_ConVarManager.HookConVarChange(pContext, cvar, static_cast<funcid_t>(params[2]));
1.18 + g_ConVarManager.HookConVarChange(pContext, pConVar, static_cast<funcid_t>(params[2]));
1.19
1.20 return 1;
1.21 }
1.22 @@ -79,15 +79,15 @@
1.23 {
1.24 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.25 HandleError err;
1.26 - ConVar *cvar;
1.27 + ConVar *pConVar;
1.28
1.29 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.30 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.31 != HandleError_None)
1.32 {
1.33 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.34 }
1.35
1.36 - g_ConVarManager.UnhookConVarChange(pContext, cvar, static_cast<funcid_t>(params[2]));
1.37 + g_ConVarManager.UnhookConVarChange(pContext, pConVar, static_cast<funcid_t>(params[2]));
1.38
1.39 return 1;
1.40 }
1.41 @@ -96,30 +96,30 @@
1.42 {
1.43 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.44 HandleError err;
1.45 - ConVar *cvar;
1.46 + ConVar *pConVar;
1.47
1.48 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.49 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.50 != HandleError_None)
1.51 {
1.52 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.53 }
1.54
1.55 - return cvar->GetBool();
1.56 + return pConVar->GetBool();
1.57 }
1.58
1.59 static cell_t sm_GetConVarInt(IPluginContext *pContext, const cell_t *params)
1.60 {
1.61 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.62 HandleError err;
1.63 - ConVar *cvar;
1.64 + ConVar *pConVar;
1.65
1.66 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.67 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.68 != HandleError_None)
1.69 {
1.70 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.71 }
1.72
1.73 - return cvar->GetInt();
1.74 + return pConVar->GetInt();
1.75 }
1.76
1.77 /* This handles both SetConVarBool() and SetConVarInt() */
1.78 @@ -127,15 +127,15 @@
1.79 {
1.80 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.81 HandleError err;
1.82 - ConVar *cvar;
1.83 + ConVar *pConVar;
1.84
1.85 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.86 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.87 != HandleError_None)
1.88 {
1.89 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.90 }
1.91
1.92 - cvar->SetValue(params[2]);
1.93 + pConVar->SetValue(params[2]);
1.94
1.95 return 1;
1.96 }
1.97 @@ -144,15 +144,15 @@
1.98 {
1.99 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.100 HandleError err;
1.101 - ConVar *cvar;
1.102 + ConVar *pConVar;
1.103
1.104 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.105 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.106 != HandleError_None)
1.107 {
1.108 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.109 }
1.110
1.111 - float value = cvar->GetFloat();
1.112 + float value = pConVar->GetFloat();
1.113
1.114 return sp_ftoc(value);
1.115 }
1.116 @@ -161,16 +161,16 @@
1.117 {
1.118 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.119 HandleError err;
1.120 - ConVar *cvar;
1.121 + ConVar *pConVar;
1.122
1.123 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.124 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.125 != HandleError_None)
1.126 {
1.127 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.128 }
1.129
1.130 float value = sp_ctof(params[2]);
1.131 - cvar->SetValue(value);
1.132 + pConVar->SetValue(value);
1.133
1.134 return 1;
1.135 }
1.136 @@ -179,15 +179,15 @@
1.137 {
1.138 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.139 HandleError err;
1.140 - ConVar *cvar;
1.141 + ConVar *pConVar;
1.142
1.143 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.144 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.145 != HandleError_None)
1.146 {
1.147 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.148 }
1.149
1.150 - pContext->StringToLocalUTF8(params[2], params[3], cvar->GetString(), NULL);
1.151 + pContext->StringToLocalUTF8(params[2], params[3], pConVar->GetString(), NULL);
1.152
1.153 return 1;
1.154 }
1.155 @@ -196,9 +196,9 @@
1.156 {
1.157 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.158 HandleError err;
1.159 - ConVar *cvar;
1.160 + ConVar *pConVar;
1.161
1.162 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.163 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.164 != HandleError_None)
1.165 {
1.166 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.167 @@ -207,7 +207,7 @@
1.168 char *value;
1.169 pContext->LocalToString(params[2], &value);
1.170
1.171 - cvar->SetValue(value);
1.172 + pConVar->SetValue(value);
1.173
1.174 return 1;
1.175 }
1.176 @@ -216,30 +216,30 @@
1.177 {
1.178 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.179 HandleError err;
1.180 - ConVar *cvar;
1.181 + ConVar *pConVar;
1.182
1.183 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.184 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.185 != HandleError_None)
1.186 {
1.187 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.188 }
1.189
1.190 - return cvar->GetFlags();
1.191 + return pConVar->GetFlags();
1.192 }
1.193
1.194 static cell_t sm_SetConVarFlags(IPluginContext *pContext, const cell_t *params)
1.195 {
1.196 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.197 HandleError err;
1.198 - ConVar *cvar;
1.199 + ConVar *pConVar;
1.200
1.201 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.202 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.203 != HandleError_None)
1.204 {
1.205 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.206 }
1.207
1.208 - cvar->SetFlags(params[2]);
1.209 + pConVar->SetFlags(params[2]);
1.210
1.211 return 1;
1.212 }
1.213 @@ -248,9 +248,9 @@
1.214 {
1.215 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.216 HandleError err;
1.217 - ConVar *cvar;
1.218 + ConVar *pConVar;
1.219
1.220 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.221 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.222 != HandleError_None)
1.223 {
1.224 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.225 @@ -262,7 +262,7 @@
1.226
1.227 pContext->LocalToPhysAddr(params[2], &addr);
1.228
1.229 - hasMin = cvar->GetMin(min);
1.230 + hasMin = pConVar->GetMin(min);
1.231 *addr = sp_ftoc(min);
1.232
1.233 return hasMin;
1.234 @@ -272,9 +272,9 @@
1.235 {
1.236 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.237 HandleError err;
1.238 - ConVar *cvar;
1.239 + ConVar *pConVar;
1.240
1.241 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.242 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.243 != HandleError_None)
1.244 {
1.245 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.246 @@ -286,7 +286,7 @@
1.247
1.248 pContext->LocalToPhysAddr(params[2], &addr);
1.249
1.250 - hasMax = cvar->GetMax(max);
1.251 + hasMax = pConVar->GetMax(max);
1.252 *addr = sp_ftoc(max);
1.253
1.254 return hasMax;
1.255 @@ -296,15 +296,15 @@
1.256 {
1.257 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.258 HandleError err;
1.259 - ConVar *cvar;
1.260 + ConVar *pConVar;
1.261
1.262 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.263 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.264 != HandleError_None)
1.265 {
1.266 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.267 }
1.268
1.269 - pContext->StringToLocalUTF8(params[2], params[3], cvar->GetName(), NULL);
1.270 + pContext->StringToLocalUTF8(params[2], params[3], pConVar->GetName(), NULL);
1.271
1.272 return 1;
1.273 }
1.274 @@ -313,15 +313,15 @@
1.275 {
1.276 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.277 HandleError err;
1.278 - ConVar *cvar;
1.279 + ConVar *pConVar;
1.280
1.281 - if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&cvar))
1.282 + if ((err=g_HandleSys.ReadHandle(hndl, g_ConVarManager.GetHandleType(), NULL, (void **)&pConVar))
1.283 != HandleError_None)
1.284 {
1.285 return pContext->ThrowNativeError("Invalid ConVar Handle %x (error %d)", hndl, err);
1.286 }
1.287
1.288 - cvar->Revert();
1.289 + pConVar->Revert();
1.290
1.291 return 1;
1.292 }
