Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove fuck

Browse Source
This commit is contained in:
sD 2020-02-21 17:18:25 +01:00
parent 8d6b69e2f2
commit f93459ed0e
5 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/courtroom.h
View File

@ -197,7 +197,7 @@ public:
//properly sets up some varibles: resets user state //properly sets up some varibles: resets user state
void enter_courtroom(int p_cid); void enter_courtroom(int p_cid);
// mfw this didnt fucking exist yet // set the character using an ID
void set_character(int char_id); void set_character(int char_id);
//helper function that populates ui_music_list with the contents of music_list //helper function that populates ui_music_list with the contents of music_list

2
include/lobby.h
View File

@ -79,7 +79,7 @@ private:
void set_size_and_pos(QWidget *p_widget, QString p_identifier); void set_size_and_pos(QWidget *p_widget, QString p_identifier);
public slots: public slots:
void fucking_threading_goddamn_it(QString fuckshitassgoddamnfuck); void lobbyThreadHandler(QString loadingText);
private slots: private slots:
void on_public_servers_clicked(); void on_public_servers_clicked();
void on_favorites_clicked(); void on_favorites_clicked();

31
src/aocharmovie.cpp
View File

@ -88,10 +88,10 @@ void AOCharMovie::play_frame_sfx()
void AOCharMovie::realization_two_network_boogaloo() void AOCharMovie::realization_two_network_boogaloo()
{ {
int current_frame = m_movie->currentFrameNumber(); int current_frame = m_movie->currentFrameNumber();
QStringList fucking_garbage = this->frame_realization_hellstring.split("^"); QStringList realizationList = this->frame_realization_hellstring.split("^");
for (int i = 0; i < fucking_garbage.length(); i++) { for (int i = 0; i < realizationList.length(); i++) {
QString fucking_christ = fucking_garbage.at(i); QString screenshakeList = realizationList.at(i);
QStringList extra_garbage = fucking_christ.split("|"); QStringList extra_garbage = screenshakeList.split("|");
if(extra_garbage.at(0) != current_emote){ if(extra_garbage.at(0) != current_emote){
continue; continue;
} }
@ -108,10 +108,10 @@ void AOCharMovie::realization_two_network_boogaloo()
void AOCharMovie::screenshake_two_network_boogaloo() void AOCharMovie::screenshake_two_network_boogaloo()
{ {
int current_frame = m_movie->currentFrameNumber(); int current_frame = m_movie->currentFrameNumber();
QStringList fucking_garbage = this->frame_screenshake_hellstring.split("^"); QStringList realizationList = this->frame_screenshake_hellstring.split("^");
for (int i = 0; i < fucking_garbage.length(); i++) { for (int i = 0; i < realizationList.length(); i++) {
QString fucking_christ = fucking_garbage.at(i); QString screenshakeList = realizationList.at(i);
QStringList extra_garbage = fucking_christ.split("|"); QStringList extra_garbage = screenshakeList.split("|");
if(extra_garbage.at(0) != current_emote){ if(extra_garbage.at(0) != current_emote){
continue; continue;
} }
@ -128,10 +128,10 @@ void AOCharMovie::screenshake_two_network_boogaloo()
void AOCharMovie::sfx_two_network_boogaloo() void AOCharMovie::sfx_two_network_boogaloo()
{ {
int current_frame = m_movie->currentFrameNumber(); int current_frame = m_movie->currentFrameNumber();
QStringList fucking_garbage = this->frame_sfx_hellstring.split("^"); QStringList realizationList = this->frame_sfx_hellstring.split("^");
for (int i = 0; i < fucking_garbage.length(); i++) { for (int i = 0; i < realizationList.length(); i++) {
QString fucking_christ = fucking_garbage.at(i); QString screenshakeList = realizationList.at(i);
QStringList extra_garbage = fucking_christ.split("|"); QStringList extra_garbage = screenshakeList.split("|");
if(extra_garbage.at(0) != current_emote){ if(extra_garbage.at(0) != current_emote){
continue; continue;
} }
@ -168,8 +168,9 @@ void AOCharMovie::movie_ticker()
{ {
m_movie->jumpToNextFrame(); m_movie->jumpToNextFrame();
} }
this->LoadImageWithStupidMethodForFlipSupport(m_movie->currentImage()); // imagine if QT had sane stuff like "mirror on QMovie" or "resize the image on QT" or "interface with the current QMovie image" or anything else this->LoadImageWithStupidMethodForFlipSupport(m_movie->currentImage());
// ps: fuck private functions/variables as a concept, freedom 2 do dangerous things 5ever // imagine if QT had sane stuff like "mirror on QMovie" or "resize the image on QT" or "interface with the current QMovie image" or anything else
this->play_frame_sfx(); this->play_frame_sfx();
if(!apng){ if(!apng){
ticker->start(m_movie->nextFrameDelay()); ticker->start(m_movie->nextFrameDelay());
@ -180,7 +181,7 @@ void AOCharMovie::movie_ticker()
void AOCharMovie::LoadImageWithStupidMethodForFlipSupport(QImage image) void AOCharMovie::LoadImageWithStupidMethodForFlipSupport(QImage image)
{ {
QPixmap f_pixmap; QPixmap f_pixmap;
if(m_flipped) // imagine if QT wasn't handicapped harder than people who think MLP is good if(m_flipped)
f_pixmap = QPixmap::fromImage(image.mirrored(true, false)); f_pixmap = QPixmap::fromImage(image.mirrored(true, false));
else else
f_pixmap = QPixmap::fromImage(image); f_pixmap = QPixmap::fromImage(image);

56
src/courtroom.cpp
View File

@ -76,7 +76,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
misc_sfx_player->set_volume(0); misc_sfx_player->set_volume(0);
frame_emote_sfx_player = new AOSfxPlayer(this, ao_app); frame_emote_sfx_player = new AOSfxPlayer(this, ao_app);
frame_emote_sfx_player->set_volume(0); frame_emote_sfx_player->set_volume(0);
pair_frame_emote_sfx_player = new AOSfxPlayer(this, ao_app); // todo: recode pair // todo: recode fucking everything pair_frame_emote_sfx_player = new AOSfxPlayer(this, ao_app); // todo: recode pair
pair_frame_emote_sfx_player->set_volume(0); pair_frame_emote_sfx_player->set_volume(0);
blip_player = new AOBlipPlayer(this, ao_app); blip_player = new AOBlipPlayer(this, ao_app);
@ -878,7 +878,7 @@ void Courtroom::set_background(QString p_background)
} }
} }
void Courtroom::set_character(int char_id) // can you fucking believe this didn't exist yet void Courtroom::set_character(int char_id)
{ {
m_cid = char_id; m_cid = char_id;
@ -1129,62 +1129,62 @@ void Courtroom::append_server_chatmessage(QString p_name, QString p_message, QSt
ui_server_chatlog->append_chatmessage(p_name, p_message, colour); ui_server_chatlog->append_chatmessage(p_name, p_message, colour);
} }
class AOFrameThreadingBullshitPre : public QRunnable class AOFrameThreadingPre : public QRunnable
{ {
public: public:
Courtroom *mycourt_fuck; Courtroom *thisCourtroom;
int my_frameNumber; int my_frameNumber;
AOFrameThreadingBullshitPre(Courtroom *my_courtroom, int frameNumber){ AOFrameThreadingPre(Courtroom *my_courtroom, int frameNumber){
mycourt_fuck = my_courtroom; thisCourtroom = my_courtroom;
my_frameNumber = frameNumber; my_frameNumber = frameNumber;
} }
void run() void run()
{ {
qDebug() << my_frameNumber << " FRAME NUMBER" << " from" << QThread::currentThread(); qDebug() << my_frameNumber << " FRAME NUMBER" << " from" << QThread::currentThread();
QString sfx_to_play = mycourt_fuck->ao_app->get_frame_sfx_name(mycourt_fuck->current_char, mycourt_fuck->ao_app->get_pre_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber); QString sfx_to_play = thisCourtroom->ao_app->get_frame_sfx_name(thisCourtroom->current_char, thisCourtroom->ao_app->get_pre_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
QString screenshake_to_play = mycourt_fuck->ao_app->get_screenshake_frame(mycourt_fuck->current_char, mycourt_fuck->ao_app->get_pre_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber); QString screenshake_to_play = thisCourtroom->ao_app->get_screenshake_frame(thisCourtroom->current_char, thisCourtroom->ao_app->get_pre_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
QString realization_to_play = mycourt_fuck->ao_app->get_realization_frame(mycourt_fuck->current_char, mycourt_fuck->ao_app->get_pre_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber); QString realization_to_play = thisCourtroom->ao_app->get_realization_frame(thisCourtroom->current_char, thisCourtroom->ao_app->get_pre_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
if(sfx_to_play != "") if(sfx_to_play != "")
{ {
mycourt_fuck->threading_sfx += "|" + QString::number(my_frameNumber) + "=" + sfx_to_play; thisCourtroom->threading_sfx += "|" + QString::number(my_frameNumber) + "=" + sfx_to_play;
} }
if(screenshake_to_play != "") if(screenshake_to_play != "")
{ {
mycourt_fuck->threading_shake += "|" + QString::number(my_frameNumber) + "=" + screenshake_to_play; thisCourtroom->threading_shake += "|" + QString::number(my_frameNumber) + "=" + screenshake_to_play;
} }
if(realization_to_play != "") if(realization_to_play != "")
{ {
mycourt_fuck->threading_flash += "|" + QString::number(my_frameNumber) + "=" + realization_to_play; thisCourtroom->threading_flash += "|" + QString::number(my_frameNumber) + "=" + realization_to_play;
} }
} }
}; };
class AOFrameThreadingBullshit : public QRunnable class AOFrameThreading : public QRunnable
{ {
public: public:
Courtroom *mycourt_fuck; Courtroom *thisCourtroom;
int my_frameNumber; int my_frameNumber;
AOFrameThreadingBullshit(Courtroom *my_courtroom, int frameNumber){ AOFrameThreading(Courtroom *my_courtroom, int frameNumber){
mycourt_fuck = my_courtroom; thisCourtroom = my_courtroom;
my_frameNumber = frameNumber; my_frameNumber = frameNumber;
} }
void run() void run()
{ {
QString sfx_to_play = mycourt_fuck->ao_app->get_frame_sfx_name(mycourt_fuck->current_char, mycourt_fuck->threading_prefix + mycourt_fuck->ao_app->get_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber); QString sfx_to_play = thisCourtroom->ao_app->get_frame_sfx_name(thisCourtroom->current_char, thisCourtroom->threading_prefix + thisCourtroom->ao_app->get_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
QString screenshake_to_play = mycourt_fuck->ao_app->get_screenshake_frame(mycourt_fuck->current_char, mycourt_fuck->threading_prefix + mycourt_fuck->ao_app->get_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber); QString screenshake_to_play = thisCourtroom->ao_app->get_screenshake_frame(thisCourtroom->current_char, thisCourtroom->threading_prefix + thisCourtroom->ao_app->get_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
QString realization_to_play = mycourt_fuck->ao_app->get_realization_frame(mycourt_fuck->current_char, mycourt_fuck->threading_prefix + mycourt_fuck->ao_app->get_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber); QString realization_to_play = thisCourtroom->ao_app->get_realization_frame(thisCourtroom->current_char, thisCourtroom->threading_prefix + thisCourtroom->ao_app->get_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
if(sfx_to_play != "") if(sfx_to_play != "")
{ {
mycourt_fuck->threading_sfx += "|" + QString::number(my_frameNumber) + "=" + sfx_to_play; thisCourtroom->threading_sfx += "|" + QString::number(my_frameNumber) + "=" + sfx_to_play;
} }
if(screenshake_to_play != "") if(screenshake_to_play != "")
{ {
mycourt_fuck->threading_shake += "|" + QString::number(my_frameNumber) + "=" + screenshake_to_play; thisCourtroom->threading_shake += "|" + QString::number(my_frameNumber) + "=" + screenshake_to_play;
} }
if(realization_to_play != "") if(realization_to_play != "")
{ {
mycourt_fuck->threading_flash += "|" + QString::number(my_frameNumber) + "=" + realization_to_play; thisCourtroom->threading_flash += "|" + QString::number(my_frameNumber) + "=" + realization_to_play;
} }
} }
}; };
@ -1393,7 +1393,7 @@ void Courtroom::on_chat_return_pressed()
frame_emote_checker = new QMovie(this); frame_emote_checker = new QMovie(this);
frame_emote_checker->setFileName(preemote); frame_emote_checker->setFileName(preemote);
frame_emote_checker->jumpToFrame(0); frame_emote_checker->jumpToFrame(0);
qDebug() << "Premote fuck: " << frame_emote_checker->frameCount(); qDebug() << "Premote: " << frame_emote_checker->frameCount();
preemote_sfx += ao_app->get_pre_emote(current_char, current_emote); preemote_sfx += ao_app->get_pre_emote(current_char, current_emote);
preemote_shake += ao_app->get_pre_emote(current_char, current_emote); preemote_shake += ao_app->get_pre_emote(current_char, current_emote);
@ -1404,7 +1404,7 @@ void Courtroom::on_chat_return_pressed()
threading_flash = preemote_flash; threading_flash = preemote_flash;
for(int i=0; i < frame_emote_checker->frameCount(); i++){ for(int i=0; i < frame_emote_checker->frameCount(); i++){
AOFrameThreadingBullshitPre *testfuck = new AOFrameThreadingBullshitPre(this, i); AOFrameThreadingPre *testfuck = new AOFrameThreadingPre(this, i);
QThreadPool::globalInstance()->start(testfuck); QThreadPool::globalInstance()->start(testfuck);
} }
QThreadPool::globalInstance()->waitForDone(); QThreadPool::globalInstance()->waitForDone();
@ -1425,7 +1425,7 @@ void Courtroom::on_chat_return_pressed()
frame_emote_checker = new QMovie(this); frame_emote_checker = new QMovie(this);
frame_emote_checker->setFileName(talkemote_to_check); frame_emote_checker->setFileName(talkemote_to_check);
frame_emote_checker->jumpToFrame(0); frame_emote_checker->jumpToFrame(0);
qDebug() << "TALK fuck: " << frame_emote_checker->frameCount(); qDebug() << "Talk: " << frame_emote_checker->frameCount();
threading_sfx = talkemote_sfx; threading_sfx = talkemote_sfx;
threading_shake = talkemote_shake; threading_shake = talkemote_shake;
@ -1433,7 +1433,7 @@ void Courtroom::on_chat_return_pressed()
threading_prefix = QString("(b)"); threading_prefix = QString("(b)");
for(int i=0; i < frame_emote_checker->frameCount(); i++){ for(int i=0; i < frame_emote_checker->frameCount(); i++){
AOFrameThreadingBullshit *testfuck = new AOFrameThreadingBullshit(this, i); AOFrameThreading *testfuck = new AOFrameThreading(this, i);
QThreadPool::globalInstance()->start(testfuck); QThreadPool::globalInstance()->start(testfuck);
} }
QThreadPool::globalInstance()->waitForDone(); QThreadPool::globalInstance()->waitForDone();
@ -1455,14 +1455,14 @@ void Courtroom::on_chat_return_pressed()
frame_emote_checker = new QMovie(this); frame_emote_checker = new QMovie(this);
frame_emote_checker->setFileName(idleemote_to_check); frame_emote_checker->setFileName(idleemote_to_check);
frame_emote_checker->jumpToFrame(0); frame_emote_checker->jumpToFrame(0);
qDebug() << "idle fuck: " << frame_emote_checker->frameCount(); qDebug() << "idle: " << frame_emote_checker->frameCount();
threading_sfx = idleemote_sfx; threading_sfx = idleemote_sfx;
threading_shake = idleemote_shake; threading_shake = idleemote_shake;
threading_flash = idleemote_flash; threading_flash = idleemote_flash;
threading_prefix = QString("(a)"); threading_prefix = QString("(a)");
for(int i=0; i < frame_emote_checker->frameCount(); i++){ for(int i=0; i < frame_emote_checker->frameCount(); i++){
AOFrameThreadingBullshit *testfuck = new AOFrameThreadingBullshit(this, i); AOFrameThreading *testfuck = new AOFrameThreading(this, i);
QThreadPool::globalInstance()->start(testfuck); QThreadPool::globalInstance()->start(testfuck);
} }
QThreadPool::globalInstance()->waitForDone(); QThreadPool::globalInstance()->waitForDone();

4
src/lobby.cpp
View File

@ -173,8 +173,8 @@ void Lobby::set_size_and_pos(QWidget *p_widget, QString p_identifier)
} }
} }
void Lobby::fucking_threading_goddamn_it(QString text){ void Lobby::lobbyThreadHandler(QString loadingText){
this->set_loading_text(text); this->set_loading_text(loadingText);
} }
void Lobby::set_loading_text(QString p_text) void Lobby::set_loading_text(QString p_text)