Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed the handling for the UOX ini tags OVERLOADPACKETS and DARKLEVEL

  • Loading branch information...
commit 87ef7b8f67695154b7487da639e1308550338571 1 parent 441b47d
giwo authored

Showing 2 changed files with 59 additions and 56 deletions. Show diff stats Hide diff stats

  1. +3 0  source/Changelog.txt
  2. +56 56 source/cServerData.cpp
3  source/Changelog.txt
... ... @@ -1,4 +1,7 @@
1 1 1/17/2009 - giwo
  2 + Fixed the handling for the UOX ini tags OVERLOADPACKETS and DARKLEVEL
  3 +
  4 +1/17/2009 - giwo
2 5 Possible fix for clients > 6.0.5.0.
3 6
4 7 1/16/2009 - giwo (0.98-3.7v)
112 source/cServerData.cpp
@@ -67,10 +67,10 @@ const std::string UOX3INI_LOOKUP("|SERVERNAME|SERVERNAME|CONSOLELOG|CRASHPROTECT
67 67 "DUNGEONLEVEL|CURRENTLEVEL|BRIGHTLEVEL|BASERANGE|BASETIMER|MAXTARGETS|MSGREDISPLAYTIME|"
68 68 "MURDERDECAYTIMER|MAXKILLS|CRIMINALTIMER|MINECHECK|OREPERAREA|ORERESPAWNTIMER|ORERESPAWNAREA|LOGSPERAREA|LOGSRESPAWNTIMER|LOGSRESPAWNAREA|HUNGERRATE|HUNGERDMGVAL|"
69 69 "MAXRANGE|SPELLMAXRANGE|DISPLAYHITMSG|MONSTERSVSANIMALS|"
70   - "ANIMALATTACKCHANCE|ANIMALSGUARDED|NPCDAMAGERATE|NPCBASEFLEEAT|NPCBASEREATTACKAT|ATTACKSTAMINA|LOCATION|STARTGOLD|STARTPRIVS|ESCORTDONEEXPIRE|LIGHTDARKLEVEL|"
  70 + "ANIMALATTACKCHANCE|ANIMALSGUARDED|NPCDAMAGERATE|NPCBASEFLEEAT|NPCBASEREATTACKAT|ATTACKSTAMINA|LOCATION|STARTGOLD|STARTPRIVS|ESCORTDONEEXPIRE|DARKLEVEL|"
71 71 "TITLECOLOUR|LEFTTEXTCOLOUR|RIGHTTEXTCOLOUR|BUTTONCANCEL|BUTTONLEFT|BUTTONRIGHT|BACKGROUNDPIC|POLLTIME|MAYORTIME|TAXPERIOD|GUARDSPAID|DAY|HOURS|MINUTES|SECONDS|AMPM|SKILLLEVEL|SNOOPISCRIME|BOOKSDIRECTORY|SERVERLIST|PORT|"
72 72 "ACCESSDIRECTORY|LOGSDIRECTORY|ACCOUNTISOLATION|HTMLDIRECTORY|SHOOTONANIMALBACK|NPCTRAININGENABLED|DICTIONARYDIRECTORY|BACKUPSAVERATIO|HIDEWILEMOUNTED|SECONDSPERUOMINUTE|WEIGHTPERSTR|POLYDURATION|"
73   - "UOGENABLED|NETRCVTIMEOUT|NETSNDTIMEOUT|NETRETRYCOUNT|CLIENTFEATURES|PACKETOVERLOADS|NPCMOVEMENTSPEED|PETHUNGEROFFLINE|PETOFFLINETIMEOUT|PETOFFLINECHECKTIMER|ARCHERRANGE|ADVANCEDPATHFINDING|SERVERFEATURES|LOOTINGISCRIME|"
  73 + "UOGENABLED|NETRCVTIMEOUT|NETSNDTIMEOUT|NETRETRYCOUNT|CLIENTFEATURES|OVERLOADPACKETS|NPCMOVEMENTSPEED|PETHUNGEROFFLINE|PETOFFLINETIMEOUT|PETOFFLINECHECKTIMER|ARCHERRANGE|ADVANCEDPATHFINDING|SERVERFEATURES|LOOTINGISCRIME|"
74 74 "NPCRUNNINGSPEED|NPCFLEEINGSPEED|BASICTOOLTIPSONLY|"
75 75 "ODBCDSN|ODBCUSER|ODBCPASS|"
76 76 );
@@ -2139,67 +2139,67 @@ bool CServerData::HandleLine( const UString tag, const UString value )
2139 2139 case 0x056A: // ESCORTDONEEXPIRE[0099]
2140 2140 SystemTimer( tSERVER_ESCORTDONE, value.toUShort() );
2141 2141 break;
2142   - case 0x057B: // LIGHTDARKLEVEL[0100]
  2142 + case 0x057B: // DARKLEVEL[0100]
2143 2143 WorldLightDarkLevel( (LIGHTLEVEL)value.toUShort() );
2144 2144 break;
2145   - case 0x058A: // TITLECOLOUR[0101]
  2145 + case 0x0585: // TITLECOLOUR[0101]
2146 2146 TitleColour( value.toUShort() );
2147 2147 break;
2148   - case 0x0596: // LEFTTEXTCOLOUR[0102]
  2148 + case 0x0591: // LEFTTEXTCOLOUR[0102]
2149 2149 LeftTextColour( value.toUShort() );
2150 2150 break;
2151   - case 0x05A5: // RIGHTTEXTCOLOUR[0103]
  2151 + case 0x05A0: // RIGHTTEXTCOLOUR[0103]
2152 2152 RightTextColour( value.toUShort() );
2153 2153 break;
2154   - case 0x05B5: // BUTTONCANCEL[0104]
  2154 + case 0x05B0: // BUTTONCANCEL[0104]
2155 2155 ButtonCancel( value.toUShort() );
2156 2156 break;
2157   - case 0x05C2: // BUTTONLEFT[0105]
  2157 + case 0x05BD: // BUTTONLEFT[0105]
2158 2158 ButtonLeft( value.toUShort() );
2159 2159 break;
2160   - case 0x05CD: // BUTTONRIGHT[0106]
  2160 + case 0x05C8: // BUTTONRIGHT[0106]
2161 2161 ButtonRight( value.toUShort() );
2162 2162 break;
2163   - case 0x05D9: // BACKGROUNDPIC[0107]
  2163 + case 0x05D4: // BACKGROUNDPIC[0107]
2164 2164 BackgroundPic( value.toUShort() );
2165 2165 break;
2166   - case 0x05E7: // POLLTIME[0108]
  2166 + case 0x05E2: // POLLTIME[0108]
2167 2167 TownNumSecsPollOpen( value.toULong() );
2168 2168 break;
2169   - case 0x05F0: // MAYORTIME[0109]
  2169 + case 0x05EB: // MAYORTIME[0109]
2170 2170 TownNumSecsAsMayor( value.toULong() );
2171 2171 break;
2172   - case 0x05FA: // TAXPERIOD[0110]
  2172 + case 0x05F5: // TAXPERIOD[0110]
2173 2173 TownTaxPeriod( value.toULong() );
2174 2174 break;
2175   - case 0x0604: // GUARDSPAID[0111]
  2175 + case 0x05FF: // GUARDSPAID[0111]
2176 2176 TownGuardPayment( value.toULong() );
2177 2177 break;
2178   - case 0x060F: // DAY[0112]
  2178 + case 0x060A: // DAY[0112]
2179 2179 ServerTimeDay( value.toShort() );
2180 2180 break;
2181   - case 0x0613: // HOURS[0113]
  2181 + case 0x060E: // HOURS[0113]
2182 2182 ServerTimeHours( value.toUByte() );
2183 2183 break;
2184   - case 0x0619: // MINUTES[0114]
  2184 + case 0x0614: // MINUTES[0114]
2185 2185 ServerTimeMinutes( value.toUByte() );
2186 2186 break;
2187   - case 0x0621: // SECONDS[0115]
  2187 + case 0x061C: // SECONDS[0115]
2188 2188 ServerTimeSeconds( value.toUByte() );
2189 2189 break;
2190   - case 0x0629: // AMPM[0116]
  2190 + case 0x0624: // AMPM[0116]
2191 2191 ServerTimeAMPM( value.toUShort() != 0 );
2192 2192 break;
2193   - case 0x062E: // SKILLLEVEL[0117]
  2193 + case 0x0629: // SKILLLEVEL[0117]
2194 2194 SkillLevel( value.toUByte() );
2195 2195 break;
2196   - case 0x0639: // SNOOPISCRIME[0118]
  2196 + case 0x0634: // SNOOPISCRIME[0118]
2197 2197 SnoopIsCrime( value.toUShort() != 0 );
2198 2198 break;
2199   - case 0x0646: // BOOKSDIRECTORY[0119]
  2199 + case 0x0641: // BOOKSDIRECTORY[0119]
2200 2200 Directory( CSDDP_BOOKS, value );
2201 2201 break;
2202   - case 0x0655: // SERVERLIST[0120]
  2202 + case 0x0650: // SERVERLIST[0120]
2203 2203 {
2204 2204 UString sname, sip, sport;
2205 2205 struct hostent *lpHostEntry = NULL;
@@ -2245,104 +2245,104 @@ bool CServerData::HandleLine( const UString tag, const UString value )
2245 2245 }
2246 2246 break;
2247 2247 }
2248   - case 0x0660: // PORT[0121]
  2248 + case 0x065B: // PORT[0121]
2249 2249 ServerPort( value.toUShort() );
2250 2250 break;
2251   - case 0x0665: // ACCESSDIRECTORY[0122]
  2251 + case 0x0660: // ACCESSDIRECTORY[0122]
2252 2252 Directory( CSDDP_ACCESS, value );
2253 2253 break;
2254   - case 0x0675: // LOGSDIRECTORY[0123]
  2254 + case 0x0670: // LOGSDIRECTORY[0123]
2255 2255 Directory( CSDDP_LOGS, value );
2256 2256 break;
2257   - case 0x0683: // ACCOUNTISOLATION[0124]
  2257 + case 0x067E: // ACCOUNTISOLATION[0124]
2258 2258 break;
2259   - case 0x0694: // HTMLDIRECTORY[0125]
  2259 + case 0x068F: // HTMLDIRECTORY[0125]
2260 2260 Directory( CSDDP_HTML, value );
2261 2261 break;
2262   - case 0x06A2: // SHOOTONANIMALBACK[0126]
  2262 + case 0x069D: // SHOOTONANIMALBACK[0126]
2263 2263 ShootOnAnimalBack( value.toUShort() == 1 );
2264 2264 break;
2265   - case 0x06B4: // NPCTRAININGENABLED[0127]
  2265 + case 0x06AF: // NPCTRAININGENABLED[0127]
2266 2266 NPCTrainingStatus( value.toUShort() == 1 );
2267 2267 break;
2268   - case 0x06C7: // DICTIONARYDIRECTORY[0128]
  2268 + case 0x06C2: // DICTIONARYDIRECTORY[0128]
2269 2269 Directory( CSDDP_DICTIONARIES, value );
2270 2270 break;
2271   - case 0x06DB: // BACKUPSAVERATIO[0129]
  2271 + case 0x06D6: // BACKUPSAVERATIO[0129]
2272 2272 BackupRatio( value.toShort() );
2273 2273 break;
2274   - case 0x06EB: // HIDEWILEMOUNTED[0130]
  2274 + case 0x06E6: // HIDEWILEMOUNTED[0130]
2275 2275 CharHideWhileMounted( value.toShort() == 1 );
2276 2276 break;
2277   - case 0x06FB: // SECONDSPERUOMINUTE[0131]
  2277 + case 0x06F6: // SECONDSPERUOMINUTE[0131]
2278 2278 ServerSecondsPerUOMinute( value.toUShort() );
2279 2279 break;
2280   - case 0x070E: // WEIGHTPERSTR[0132]
  2280 + case 0x0709: // WEIGHTPERSTR[0132]
2281 2281 //WeightPerStr( value.toUByte() );
2282 2282 WeightPerStr( value.toFloat() );
2283 2283 break;
2284   - case 0x071B: // POLYDURATION[0133]
  2284 + case 0x0716: // POLYDURATION[0133]
2285 2285 SystemTimer( tSERVER_POLYMORPH, value.toUShort() );
2286 2286 break;
2287   - case 0x0728: // UOGENABLED[0134]
  2287 + case 0x0723: // UOGENABLED[0134]
2288 2288 ServerUOGEnabled( value.toShort()==1 );
2289 2289 break;
2290   - case 0x0733: // NETRCVTIMEOUT[0135]
  2290 + case 0x072E: // NETRCVTIMEOUT[0135]
2291 2291 ServerNetRcvTimeout( value.toULong() );
2292 2292 break;
2293   - case 0x0741: // NETSNDTIMEOUT[0136]
  2293 + case 0x073C: // NETSNDTIMEOUT[0136]
2294 2294 ServerNetSndTimeout( value.toULong() );
2295 2295 break;
2296   - case 0x074F: // NETRETRYCOUNT[0137]
  2296 + case 0x074A: // NETRETRYCOUNT[0137]
2297 2297 ServerNetRetryCount( value.toULong() );
2298 2298 break;
2299   - case 0x075D: // CLIENTFEATURES[0138]
  2299 + case 0x0758: // CLIENTFEATURES[0138]
2300 2300 SetClientFeatures( value.toUShort() );
2301 2301 break;
2302   - case 0x076C: // PACKETOVERLOADS[0139]
  2302 + case 0x0767: // PACKETOVERLOADS[0139]
2303 2303 ServerOverloadPackets( (value.toByte() == 1) );
2304 2304 break;
2305   - case 0x077C: // NPCMOVEMENTSPEED[0140]
  2305 + case 0x0777: // NPCMOVEMENTSPEED[0140]
2306 2306 NPCWalkingSpeed( value.toFloat() );
2307 2307 break;
2308   - case 0x078D: // PETHUNGEROFFLINE[0141]
  2308 + case 0x0788: // PETHUNGEROFFLINE[0141]
2309 2309 PetHungerOffline( (value.toByte() == 1) );
2310 2310 break;
2311   - case 0x079E: // PETOFFLINETIMEOUT[0142]
  2311 + case 0x0799: // PETOFFLINETIMEOUT[0142]
2312 2312 PetOfflineTimeout( value.toUShort() );
2313 2313 break;
2314   - case 0x07B0: // PETOFFLINECHECKTIMER[0143]
  2314 + case 0x07AB: // PETOFFLINECHECKTIMER[0143]
2315 2315 SystemTimer( tSERVER_PETOFFLINECHECK, value.toUShort() );
2316 2316 break;
2317   - case 0x07C5: // ARCHERRANGE[0144]
  2317 + case 0x07C0: // ARCHERRANGE[0144]
2318 2318 CombatArcherRange( value.toShort() );
2319 2319 break;
2320   - case 0x07D1: // ADVANCEDPATHFINDING[0145]
  2320 + case 0x07CC: // ADVANCEDPATHFINDING[0145]
2321 2321 AdvancedPathfinding( (value.toByte() == 1) );
2322 2322 break;
2323   - case 0x07E5: // SERVERFEATURES[0146]
  2323 + case 0x07E0: // SERVERFEATURES[0146]
2324 2324 SetServerFeatures( value.toULong() );
2325 2325 break;
2326   - case 0x07F4: // LOOTINGISCRIME[0147]
  2326 + case 0x07EF: // LOOTINGISCRIME[0147]
2327 2327 LootingIsCrime( (value.toByte() == 1) );
2328 2328 break;
2329   - case 0x0803: // NPCRUNNINGSPEED[0148]
  2329 + case 0x07FE: // NPCRUNNINGSPEED[0148]
2330 2330 NPCRunningSpeed( value.toFloat() );
2331 2331 break;
2332   - case 0x0813: // NPCFLEEINGSPEED[0149]
  2332 + case 0x080E: // NPCFLEEINGSPEED[0149]
2333 2333 NPCFleeingSpeed( value.toFloat() );
2334 2334 break;
2335   - case 0x0823: // BASICTOOLTIPSONLY[0150]
  2335 + case 0x081E: // BASICTOOLTIPSONLY[0150]
2336 2336 BasicTooltipsOnly( (value.toByte() == 1) );
2337 2337 break;
2338 2338 #if P_ODBC == 1
2339   - case 0x0835: // ODBCDSN[0151]
  2339 + case 0x0830: // ODBCDSN[0151]
2340 2340 ODBCManager::getSingleton().SetDatabase( value );
2341 2341 break;
2342   - case 0x083D: // ODBCUSER[0152]
  2342 + case 0x0838: // ODBCUSER[0152]
2343 2343 ODBCManager::getSingleton().SetUsername( value );
2344 2344 break;
2345   - case 0x0846: // ODBCPASS[0153]
  2345 + case 0x0841: // ODBCPASS[0153]
2346 2346 ODBCManager::getSingleton().SetPassword( value );
2347 2347 break;
2348 2348 #endif

0 comments on commit 87ef7b8

Please sign in to comment.
Something went wrong with that request. Please try again.