imagepack: moved temple ra pack from code to config, based on 32000 idx

s.kushnirenko · s.kushnirenko · commit 76fa837bc3a4 · 2024-02-04T22:51:52.000+01:00
diff --git a/src/graphics/image.cpp b/src/graphics/image.cpp
@@ -174,7 +174,6 @@ bool image_load_paks() {
     // the 5 Temple Complex paks.
     // <--- original temple complex pak here
     data.temple_paks.push_back(new imagepak("Temple_nile", 15591));
-    data.temple_paks.push_back(new imagepak("Temple_ra", 15591));
     data.temple_paks.push_back(new imagepak("Temple_ptah", 15591));
     data.temple_paks.push_back(new imagepak("Temple_seth", 15591));
     data.temple_paks.push_back(new imagepak("Temple_bast", 15591));
diff --git a/src/graphics/image_groups.h b/src/graphics/image_groups.h
@@ -19,6 +19,8 @@ enum e_pack {
     //
     PACK_MASTABA,
     //
+    PACK_TEMPLE_RA,
+    //
     PACK_CUSTOM,
 };
 
diff --git a/src/js/js_constants.cpp b/src/js/js_constants.cpp
@@ -39,6 +39,7 @@ void js_register_collection_images(js_State *J) {
    REGISTER_GLOBAL_CONSTANT(J, PACK_EXPANSION);
    REGISTER_GLOBAL_CONSTANT(J, PACK_EXPANSION_SPR);
    REGISTER_GLOBAL_CONSTANT(J, PACK_MASTABA);
+   REGISTER_GLOBAL_CONSTANT(J, PACK_TEMPLE_RA);
    REGISTER_GLOBAL_CONSTANT(J, PACK_CUSTOM);
 }
 
diff --git a/src/scripts/imagepaks.js b/src/scripts/imagepaks.js
@@ -7,5 +7,6 @@ imagepaks = [
   {id: PACK_TERRAIN, name:"Pharaoh_Terrain", index:14252, system:false}, // 14252 --> 15767 (+64)
   {id: PACK_SPR_AMBIENT, name:"SprAmbient", index:15831, system:false}, // 15831 --> 18765
   {id: PACK_MASTABA, name:"mastaba", index:25000, system:false}, // 23735 --> 23735 + 429
+  {id: PACK_TEMPLE_RA, name:"Temple_ra", index:32000, system:false}, // 32000 --> 32000 + 239
   //{id: PACK_CUSTOM, name:"Pharaoh_Custom", index:30000, system:false, custom:true},  // 30000 -->
 ]
diff --git a/src/scripts/images.js b/src/scripts/images.js
@@ -5,6 +5,7 @@ small_statue_images = [
 	{pack: PACK_GENERAL, id: 61, offset:5},
 	{pack: PACK_EXPANSION, id: 37, offset:1},
 	{pack: PACK_EXPANSION, id: 37, offset:5},
+	{pack: PACK_TEMPLE_RA, id: 1, offset:27},
 ]
 
 medium_statue_images = [

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ void js_register_collection_images(js_State *J) {`
`39`	`39`	`REGISTER_GLOBAL_CONSTANT(J, PACK_EXPANSION);`
`40`	`40`	`REGISTER_GLOBAL_CONSTANT(J, PACK_EXPANSION_SPR);`
`41`	`41`	`REGISTER_GLOBAL_CONSTANT(J, PACK_MASTABA);`
	`42`	`+ REGISTER_GLOBAL_CONSTANT(J, PACK_TEMPLE_RA);`
`42`	`43`	`REGISTER_GLOBAL_CONSTANT(J, PACK_CUSTOM);`
`43`	`44`	`}`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ imagepaks = [`
`7`	`7`	`{id: PACK_TERRAIN, name:"Pharaoh_Terrain", index:14252, system:false}, // 14252 --> 15767 (+64)`
`8`	`8`	`{id: PACK_SPR_AMBIENT, name:"SprAmbient", index:15831, system:false}, // 15831 --> 18765`
`9`	`9`	`{id: PACK_MASTABA, name:"mastaba", index:25000, system:false}, // 23735 --> 23735 + 429`
	`10`	`+ {id: PACK_TEMPLE_RA, name:"Temple_ra", index:32000, system:false}, // 32000 --> 32000 + 239`
`10`	`11`	`//{id: PACK_CUSTOM, name:"Pharaoh_Custom", index:30000, system:false, custom:true}, // 30000 -->`
`11`	`12`	`]`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ small_statue_images = [`
`5`	`5`	`{pack: PACK_GENERAL, id: 61, offset:5},`
`6`	`6`	`{pack: PACK_EXPANSION, id: 37, offset:1},`
`7`	`7`	`{pack: PACK_EXPANSION, id: 37, offset:5},`
	`8`	`+ {pack: PACK_TEMPLE_RA, id: 1, offset:27},`
`8`	`9`	`]`
`9`	`10`
`10`	`11`	`medium_statue_images = [`