OnePointDemo OK (#719)

* matches

* more matches

* progress?

* it's time

* so close

* organize declarations

* docs

* more fixes

* more fixes

* fix stage 1

* more fixes

* first try

* demo ids in decimal

* final cleanup

* one more thing

* fixes

* more cleanup

* onepointcs

* OnePointCutscene

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/code/z_camera_data.c b/src/code/z_camera_data.c
index 4ec44ff3d..a88d5e9a1 100644
--- a/src/code/z_camera_data.c
+++ b/src/code/z_camera_data.c
@@ -3445,7 +3445,7 @@ Vec3f D_8011D678[] = {
 s32 sDemo5PrevSfxFrame = -200;
 
 // target is player, far from eye
-OnePointDemoFull D_8011D6AC[] = {
+OnePointCsFull D_8011D6AC[] = {
     { // initflags & 0x00FF (at): 2, atTarget is view lookAt + atInit
       // initFlags & 0xFF00 (eye): none
       // action: 15, copy at, eye, roll, fov to camera
@@ -3487,14 +3487,14 @@ OnePointDemoFull D_8011D6AC[] = {
 };
 
 // target is player close to current eye
-OnePointDemoFull D_8011D724[] = {
+OnePointCsFull D_8011D724[] = {
     { 0x8F, 0xFF, 0x2424, 0x0001, 0x0000, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 10.0f, -20.0f } },
     { 0x81, 0xFF, 0x2121, 0x0013, 0x0000, 50.0f, 1.0f, { 0.0f, -10.0f, 0.0f }, { 0.0f, 0.0f, 60.0f } },
     { 0x12, 0xFF, 0x0000, 0x0001, 0x0000, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
 // target is close to player
-OnePointDemoFull D_8011D79C[] = {
+OnePointCsFull D_8011D79C[] = {
     { 0xCF, 0xFF, 0x0002, 0x0001, 0x0000, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0xC1, 0xFF, 0x0303, 0x0013, 0x0000, 45.0f, 1.0f, { 0.0f, -20.0f, 0.0f }, { 0.0f, -10.0f, 5.0f } },
     {
@@ -3512,7 +3512,7 @@ OnePointDemoFull D_8011D79C[] = {
 };
 
 // target is within 300 units of eye, and player is within 30 units of eye
-OnePointDemoFull D_8011D83C[] = {
+OnePointCsFull D_8011D83C[] = {
     { 0x83, 0xFF, 0x2141, 0x0014, 0x0000, 45.0f, 0.2f, { 0.0f, 0.0f, 10.0f }, { 0.0f, 0.0f, 10.0f } },
     { 0x12, 0xFF, 0x0000, 0x0001, 0x0000, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
@@ -3520,20 +3520,20 @@ OnePointDemoFull D_8011D83C[] = {
 // target is within 700 units of eye, angle between player/eye and target/eye is less than
 // 76.9 degrees.  The x/y coordinates of the target on screen is between (21, 41) and (300, 200),
 // and the player is farther than 30 units of the eye
-OnePointDemoFull D_8011D88C[] = {
+OnePointCsFull D_8011D88C[] = {
     { 0x81, 0xFF, 0x0303, 0x0014, 0x0000, 45.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x12, 0xFF, 0x0000, 0x0001, 0x0000, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
 // same as above, but the target is NOT within the screen area.
-OnePointDemoFull D_8011D8DC[] = {
+OnePointCsFull D_8011D8DC[] = {
     { 0x8F, 0xFF, 0x0404, 0x0014, 0x0001, 50.0f, 1.0f, { 0.0f, 5.0f, 10.0f }, { 0.0f, 10.0f, -80.0f } },
     { 0x82, 0xFF, 0x2121, 0x0005, 0x0000, 60.0f, 1.0f, { 0.0f, 5.0f, 0.0f }, { 5.0f, 5.0f, -200.0f } },
     { 0x12, 0xFF, 0x0000, 0x0001, 0x0000, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
 // target is a door.
-OnePointDemoFull D_8011D954[] = {
+OnePointCsFull D_8011D954[] = {
     { 0x0F, 0xFF, 0xC1C1, 0x0014, 0x0000, 60.0f, 1.0f, { 0.0f, 0.0f, 50.0f }, { 0.0f, 0.0f, 250.0f } },
     { 0x83, 0xFF, 0x05B1, 0x0005, 0x0000, 60.0f, 0.1f, { 0.0f, 10.0f, 50.0f }, { 0.0f, 10.0f, 100.0f } },
     { 0x82, 0xFF, 0x2121, 0x0005, 0x0002, 60.0f, 1.0f, { 0.0f, 10.0f, 0.0f }, { 0.0f, 20.0f, -150.0f } },
@@ -3541,7 +3541,7 @@ OnePointDemoFull D_8011D954[] = {
 };
 
 // otherwise
-OnePointDemoFull D_8011D9F4[] = {
+OnePointCsFull D_8011D9F4[] = {
     { 0x8F, 0xFF, 0x0504, 0x0014, 0x0002, 60.0f, 1.0f, { 0.0f, 5.0f, 50.0f }, { 0.0f, 20.0f, 300.0f } },
     { 0x82, 0xFF, 0x2121, 0x0005, 0x0002, 60.0f, 1.0f, { 0.0f, 10.0f, 0.0f }, { 0.0f, 20.0f, -150.0f } },
     { 0x12, 0xFF, 0x0000, 0x0001, 0x0000, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },