Mercurial > mm7
comparison mm7_1.cpp @ 266:006188b68143
Merge
author | Nomad |
---|---|
date | Mon, 18 Feb 2013 10:06:38 +0200 |
parents | 96bc024a5fed fb890fb66cad |
children | 0ea5fbd16edb |
comparison
equal
deleted
inserted
replaced
265:96bc024a5fed | 266:006188b68143 |
---|---|
3152 if ( v121->uNPC_ID ) | 3152 if ( v121->uNPC_ID ) |
3153 { | 3153 { |
3154 v37 = v112[6]; | 3154 v37 = v112[6]; |
3155 if ( v37 ) | 3155 if ( v37 ) |
3156 { | 3156 { |
3157 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]); | 3157 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]); |
3158 } | 3158 } |
3159 else | 3159 else |
3160 { | 3160 { |
3161 v77 = 2000; | 3161 v77 = 2000; |
3162 v72 = *v112; | 3162 v72 = *v112; |