Advertisement
Guest User

diff

a guest
Oct 26th, 2018
101
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.00 KB | None | 0 0
  1. diff framerate_type_original.h src/framerate_type.h
  2.  
  3. 29a30
  4. > PFE_SPRITEGROUP,
  5.  
  6. diff framerate_gui_original.cpp src/framerate_gui.cpp
  7.  
  8. 167a168
  9. > PerformanceData(10000.0), // PFE_SPRITEGROUP
  10. 792a794
  11. > "Sprite group",
  12. 795c797
  13. < static const PerformanceElement rate_elements[] = { PFE_GAMELOOP, PFE_DRAWING, PFE_VIDEO };
  14. ---
  15. > static const PerformanceElement rate_elements[] = { PFE_GAMELOOP, PFE_DRAWING, PFE_VIDEO, };
  16.  
  17. diff newgrf_spritegroup_original.cpp src/newgrf_spritegroup.cpp
  18.  
  19. 19a20
  20. > #include "framerate_type.h"
  21. 68a70
  22. > case 0x1A: return UINT_MAX;
  23. 80a83
  24. > // printf("GRF ID: %X, Variable: %X",object.grffile->grfid, variable);
  25. 82c85,89
  26. < if (variable < 0x40 && GetGlobalVariable(variable, &value, object.grffile)) return value;
  27. ---
  28. > if (variable < 0x40 && GetGlobalVariable(variable, &value, object.grffile)) {
  29. > // printf(", common\n");
  30. > return value;
  31. > }
  32. > // printf(", uncommon\n");
  33. 214a222
  34. > PerformanceAccumulator framerate(PFE_SPRITEGROUP);
  35. 226c234,240
  36. < if (adjust->variable == 0x7E) {
  37. ---
  38. > byte current_var = adjust->variable;
  39. > // printf("GRF ID: %X, Variable: %X, Check: %d\n",object.grffile->grfid, current_var, _sprite_group_resolve_check_veh_check);
  40. >
  41. > if (current_var == 0x1A) {
  42. > value = UINT_MAX;
  43. >
  44. > } else if (current_var == 0x7E) {
  45. 236c250
  46. < } else if (adjust->variable == 0x7B) {
  47. ---
  48. > } else if (current_var == 0x7B) {
  49. 241c255
  50. < switch (adjust->variable) {
  51. ---
  52. > switch (current_var) {
  53. 244c258
  54. < case 0x1A:
  55. ---
  56. > // case 0x1A:
  57. 277c291
  58. < if (_sprite_group_resolve_check_veh_type != VEH_ROAD) {
  59. ---
  60. > if (_sprite_group_resolve_check_veh_type != VEH_ROAD) {
  61. 287c301
  62. < value = GetVariable(object, scope, adjust->variable, adjust->parameter, &available);
  63. ---
  64. > value = GetVariable(object, scope, current_var, adjust->parameter, &available);
  65. 313a328
  66. > // printf("GRF ID: %X, Variable: %X, size_type: %d\n", object.grffile->grfid, current_var, this->size);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement